diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5db02bf35..4f999607f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,13 @@ variables:
   # CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
   # The tag is an arbitrary string that identifies the exact container
   # contents.
+<<<<<<< HEAD
+  FDO_DISTRIBUTION_TAG: '2021-03-01-02'
+  FDO_DISTRIBUTION_VERSION: '18.04'
+=======
   FDO_DISTRIBUTION_TAG: '2023-08-13-00'
   FDO_DISTRIBUTION_VERSION: '20.04'
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio'
 
 include:
diff --git a/NEWS b/NEWS
index a7a5dbd90..06e3432e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 PulseAudio 17.0
 
 Changes at a glance:
@@ -184,6 +186,7 @@ tensorknower69
 김인수
 
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 PulseAudio 15.0
 
 Changes at a glance:
diff --git a/man/meson.build b/man/meson.build
index d72b3cf96..906be3a7f 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -14,6 +14,13 @@ if get_option('daemon')
   ]
 endif
 
+<<<<<<< HEAD
+manpages += [
+  ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
+  ['pactl', '1'],
+  ['pulse-client.conf', '5'],
+]
+=======
 if get_option('client')
   manpages += [
     ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
@@ -33,6 +40,19 @@ if get_option('client')
     ]
   endif
 endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+
+if cdata.has('HAVE_OSS_WRAPPER')
+  manpages += [
+    ['padsp', '1'],
+  ]
+endif
+
+if x11_dep.found()
+  manpages += [
+    ['pax11publish', '1'],
+  ]
+endif
 
 # FIXME: Add esdcompat if HAVE_ESOUND
 #manpages += ['esdcompat', '1'],
diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in
index ca365dc23..51913f28f 100644
--- a/man/pactl.1.xml.in
+++ b/man/pactl.1.xml.in
@@ -174,9 +174,13 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
     <option>
       <p><opt>set-default-sink</opt> <arg>SINK</arg></p>
+<<<<<<< HEAD
+      <optdesc><p>Make the specified sink (identified by its symbolic name or numerical index) the default sink.</p></optdesc>
+=======
       <optdesc><p>Make the specified sink (identified by its symbolic name or numerical index) the default sink.
          Use the special name \@NONE@ to unset the user defined default sink. This will make pulseaudio return to the default
          sink selection based on sink priority.</p></optdesc>
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     </option>
 
     <option>
@@ -191,9 +195,13 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
     <option>
       <p><opt>set-default-source</opt> <arg>SOURCE</arg></p>
+<<<<<<< HEAD
+      <optdesc><p>Make the specified source (identified by its symbolic name or numerical index) the default source.</p></optdesc>
+=======
       <optdesc><p>Make the specified source (identified by its symbolic name or numerical index) the default source.
          Use the special name \@NONE@ to unset the user defined default source. This will make pulseaudio return to the default
          source selection based on source priority.</p></optdesc>
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     </option>
 
     <option>
diff --git a/meson.build b/meson.build
index 1aec95adc..e7f1664a5 100644
--- a/meson.build
+++ b/meson.build
@@ -4,9 +4,13 @@ project('pulseaudio', 'c',
         default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ]
         )
 
+<<<<<<< HEAD
+meson.add_dist_script('scripts/save-tarball-version.sh', meson.project_version())
+=======
 if not meson.is_subproject()
   meson.add_dist_script('scripts/save-tarball-version.sh', meson.project_version())
 endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 pa_version_str = meson.project_version()
 # For tarballs, the first split will do nothing, but for builds in git, we
@@ -27,7 +31,11 @@ pa_protocol_version = 35
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold x=z
+<<<<<<< HEAD
+libpulse_version_info = [24, 0, 24]
+=======
 libpulse_version_info = [24, 3, 24]
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold x=z
@@ -72,7 +80,10 @@ localedir = join_paths(prefix, get_option('localedir'))
 localstatedir = join_paths(prefix, get_option('localstatedir'))
 sysconfdir = join_paths(prefix, get_option('sysconfdir'))
 privlibdir = join_paths(libdir, 'pulseaudio')
+<<<<<<< HEAD
+=======
 po_dir = join_paths(meson.current_source_dir(), 'po')
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 if host_machine.system() == 'windows'
   # Windows only supports loading libraries from the same dir as the executable
@@ -430,7 +441,11 @@ cdata.set('MESON_BUILD', 1)
 # so we request the nodelete flag to be enabled.
 # On other systems, we don't really know how to do that, but it's welcome if somebody can tell.
 # Windows doesn't support this flag.
+<<<<<<< HEAD
+if host_machine.system() != 'windows'
+=======
 if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   nodelete_link_args = ['-Wl,-z,nodelete']
 else
   nodelete_link_args = []
@@ -594,7 +609,26 @@ if host_machine.cpu_family() == 'arm'
 endif
 # NEON checks are automatically done by the unstable-simd module
 
+<<<<<<< HEAD
+if get_option('daemon')
+  # FIXME: make sure it's >= 2.2
+  ltdl_dep = cc.find_library('ltdl', required : true)
+endif
+
+# FIXME: can meson support libtool -dlopen/-dlpreopen things?
+#        and do we still want to support this at all?
+cdata.set('DISABLE_LIBTOOL_PRELOAD', 1)
+
+if get_option('database') == 'tdb'
+  database_dep = dependency('tdb')
+elif get_option('database') == 'gdbm'
+  database_dep = cc.find_library('gdbm', required : true)
+else
+  database_dep = dependency('', required: false)
+endif
+=======
 # Dependencies common to client, daemon and modules
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 if get_option('ipv6')
   cdata.set('HAVE_IPV6', 1)
@@ -605,6 +639,17 @@ if dbus_dep.found()
   cdata.set('HAVE_DBUS', 1)
 endif
 
+<<<<<<< HEAD
+gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
+if get_option('gsettings').enabled()
+  assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
+  cdata.set('HAVE_GSETTINGS', 1)
+else
+  cdata.set('HAVE_GSETTINGS', 0)
+endif
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 glib_dep = dependency('glib-2.0', version : '>= 2.28.0', required: get_option('glib'))
 if glib_dep.found()
   cdata.set('HAVE_GLIB', 1)
@@ -620,11 +665,37 @@ if libsystemd_dep.found()
   cdata.set('HAVE_SYSTEMD_JOURNAL', 1)
 endif
 
+libelogind_dep = dependency('libelogind', required : get_option('elogind'))
+if libelogind_dep.found()
+  cdata.set('HAVE_SYSTEMD_LOGIN', 1)
+endif
+
+tcpwrap_dep = cc.find_library('wrap', required: get_option('tcpwrap'))
+if cc.has_header('tcpd.h') and cc.has_function('hosts_access', dependencies : tcpwrap_dep)
+  cdata.set('HAVE_LIBWRAP', 1)
+endif
+
 x11_dep = dependency('x11-xcb', required : get_option('x11'))
+<<<<<<< HEAD
+if x11_dep.found()
+  xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
+  ice_dep  = dependency('ice',  required : get_option('daemon'))
+  sm_dep   = dependency('sm',   required : get_option('daemon'))
+  xtst_dep = dependency('xtst', required : get_option('daemon'))
+  cdata.set('HAVE_X11', 1)
+  if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
+    cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
+  endif
+endif
+
+# Module dependencies
+if cc.has_header('sys/soundcard.h', required: get_option('oss-output'))
+=======
 
 # OSS support
 if cc.has_header('sys/soundcard.h', required: get_option('oss-output'))
   # OSS output via daemon module-detect
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   cdata.set('HAVE_OSS_OUTPUT', 1)
   # OSS wrapper
   cdata.set('HAVE_OSS_WRAPPER', 1)
@@ -636,12 +707,34 @@ if fftw_dep.found()
   cdata.set('HAVE_FFTW', 1)
 endif
 
+<<<<<<< HEAD
+avahi_dep = dependency('avahi-client', version : '>= 0.6.0', required : get_option('avahi'), disabler : true)
+if avahi_dep.found()
+  cdata.set('HAVE_AVAHI', 1)
+else
+  cdata.set('HAVE_AVAHI', 0)
+endif
+
+sbc_dep = dependency('sbc', version : '>= 1.0', required : false)
+
+bluez_dep = dependency('bluez', required : get_option('bluez5'))
+
+if bluez_dep.found()
+  assert(dbus_dep.found(), 'BlueZ requires D-Bus support')
+  assert(sbc_dep.found(), 'BlueZ requires SBC support')
+  cdata.set('HAVE_SBC', 1)
+  cdata.set('HAVE_BLUEZ', 1)
+  cdata.set('HAVE_BLUEZ_5', 1)
+  if get_option('bluez5-native-headset')
+    cdata.set('HAVE_BLUEZ_5_NATIVE_HEADSET', 1)
+=======
 # Client library dependencies
 
 if get_option('client')
   asyncns_dep = dependency('libasyncns', version : '>= 0.1', required : get_option('asyncns'))
   if asyncns_dep.found()
     cdata.set('HAVE_LIBASYNCNS', 1)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   endif
 
   gtk_dep = dependency('gtk+-3.0', required : get_option('gtk'))
@@ -806,6 +899,16 @@ if get_option('daemon')
     cdata.set('HAVE_UDEV', 1)
   endif
 
+<<<<<<< HEAD
+gst_dep = dependency('gstreamer-1.0', version : '>= 1.14', required : get_option('gstreamer'))
+gstapp_dep = dependency('gstreamer-app-1.0', required : get_option('gstreamer'))
+gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer'))
+
+have_gstreamer = false
+if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found()
+  assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)')
+  have_gstreamer = true
+=======
   if get_option('hal-compat')
     cdata.set('HAVE_HAL_COMPAT', 1)
   endif
@@ -828,6 +931,16 @@ if get_option('daemon')
     cdata.set('HAVE_GSTLDAC', 1)
     cdata.set('HAVE_GSTAPTX', 1)
   endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+endif
+
+bluez5_gst_dep = dependency('gstreamer-1.0', version : '>= 1.14', required : get_option('bluez5-gstreamer'))
+bluez5_gstapp_dep = dependency('gstreamer-app-1.0', required : get_option('bluez5-gstreamer'))
+have_bluez5_gstreamer = false
+if bluez5_gst_dep.found() and bluez5_gstapp_dep.found()
+  have_bluez5_gstreamer = true
+  cdata.set('HAVE_GSTLDAC', 1)
+  cdata.set('HAVE_GSTAPTX', 1)
 endif
 
 # These are required for the CMake file generation
@@ -843,9 +956,13 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te
 if get_option('doxygen')
   subdir('doxygen')
 endif
+<<<<<<< HEAD
+subdir('po')
+=======
 if get_option('client')
   subdir('po')
 endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 if get_option('man')
   subdir('man')
 endif
@@ -956,6 +1073,14 @@ summary = [
 #  'LIBS:                          @0@'.format(${LIBS}),
   '',
   'Enable pulseaudio daemon:      @0@'.format(get_option('daemon')),
+<<<<<<< HEAD
+  '',
+  'Enable memfd shared memory:    @0@'.format(cdata.has('HAVE_MEMFD')),
+  'Enable X11:                    @0@'.format(x11_dep.found()),
+  '  Safe X11 I/O errors:         @0@'.format(cdata.has('HAVE_XSETIOERROREXITHANDLER')),
+  'Enable OSS Output:             @0@'.format(cdata.has('HAVE_OSS_OUTPUT')),
+  'Enable OSS Wrapper:            @0@'.format(cdata.has('HAVE_OSS_WRAPPER')),
+=======
   'Enable pulseaudio client:      @0@'.format(get_option('client')),
   '',
   'Enable memfd shared memory:    @0@'.format(cdata.has('HAVE_MEMFD')),
@@ -990,6 +1115,7 @@ summary += [
   'Safe X11 I/O errors:           @0@'.format(cdata.has('HAVE_XSETIOERROREXITHANDLER')),
   'Enable Avahi:                  @0@'.format(avahi_dep.found()),
   'Enable OSS Output:             @0@'.format(cdata.has('HAVE_OSS_OUTPUT')),
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #  'Enable EsounD:                 @0@'.format(${ENABLE_ESOUND}),
   'Enable Alsa:                   @0@'.format(alsa_dep.found()),
   'Enable Jack:                   @0@'.format(jack_dep.found()),
@@ -997,18 +1123,45 @@ summary += [
 #  'Enable CoreAudio:              @0@'.format(${ENABLE_COREAUDIO}),
 #  'Enable Solaris:                @0@'.format(${ENABLE_SOLARIS}),
 #  'Enable WaveOut:                @0@'.format(${ENABLE_WAVEOUT}),
+<<<<<<< HEAD
+  'Enable GLib 2:                 @0@'.format(glib_dep.found()),
+  'Enable GSettings:              @0@'.format(gio_dep.found()),
+  'Enable Gtk+ 3:                 @0@'.format(gtk_dep.found()),
+  'Enable Avahi:                  @0@'.format(avahi_dep.found()),
+  'Enable Jack:                   @0@'.format(jack_dep.found()),
+  'Enable Async DNS:              @0@'.format(asyncns_dep.found()),
+  'Enable LIRC:                   @0@'.format(lirc_dep.found()),
+  'Enable D-Bus:                  @0@'.format(dbus_dep.found()),
+  '  Enable BlueZ 5:              @0@'.format(cdata.has('HAVE_BLUEZ_5')),
+  '    Enable native headsets:    @0@'.format(cdata.has('HAVE_BLUEZ_5_NATIVE_HEADSET')),
+  '    Enable  ofono headsets:    @0@'.format(cdata.has('HAVE_BLUEZ_5_OFONO_HEADSET')),
+  '    Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer),
+  'Enable udev:                   @0@'.format(udev_dep.found()),
+  '  Enable HAL->udev compat:     @0@'.format(get_option('hal-compat')),
+  'Enable systemd:                @0@'.format(libsystemd_dep.found()),
+  'Enable elogind:                @0@'.format(libelogind_dep.found()),
+  'Enable TCP Wrappers:           @0@'.format(tcpwrap_dep.found()),
+=======
   'Enable GSettings:              @0@'.format(gio_dep.found()),
   'Enable BlueZ 5:              @0@'.format(cdata.has('HAVE_BLUEZ_5')),
   '  Enable native headsets:    @0@'.format(cdata.has('HAVE_BLUEZ_5_NATIVE_HEADSET')),
   '  Enable  ofono headsets:    @0@'.format(cdata.has('HAVE_BLUEZ_5_OFONO_HEADSET')),
   '  Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer),
   'Enable GStreamer:              @0@'.format(have_gstreamer),
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   'Enable libsamplerate:          @0@'.format(samplerate_dep.found()),
   'Enable ORC:                    @0@'.format(have_orcc),
   'Enable Adrian echo canceller:  @0@'.format(get_option('adrian-aec')),
   'Enable Speex (resampler, AEC): @0@'.format(speex_dep.found()),
   'Enable SoXR (resampler):       @0@'.format(soxr_dep.found()),
   'Enable WebRTC echo canceller:  @0@'.format(webrtc_dep.found()),
+<<<<<<< HEAD
+  'Enable Gcov coverage:          @0@'.format(get_option('gcov')),
+  'Enable Valgrind:               @0@'.format(cdata.has('HAVE_VALGRIND_MEMCHECK_H')),
+  'Enable man pages:              @0@'.format(get_option('man')),
+  'Enable unit tests:             @0@'.format(get_option('tests')),
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   '',
   'Enable udev:                   @0@'.format(udev_dep.found()),
   '  Enable HAL->udev compat:     @0@'.format(get_option('hal-compat')),
@@ -1043,6 +1196,38 @@ if get_option('daemon') and samplerate_dep.found()
   warning('Support for libsamplerate is DEPRECATED')
 endif
 
+<<<<<<< HEAD
+if host_machine.system() != 'windows'
+  if not dbus_dep.found()
+    message = [
+      'You do not have D-Bus support enabled. It is strongly recommended',
+      'that you enable D-Bus support if your platform supports it.',
+      'Many parts of PulseAudio use D-Bus, from ConsoleKit interaction',
+      'to the Device Reservation Protocol to speak to JACK, Bluetooth',
+      'support and even a native control protocol for communicating and',
+      'controlling the PulseAudio daemon itself.',
+    ]
+    warning('\n' + '\n'.join(message))
+  endif
+  if host_machine.system() == 'linux' and not udev_dep.found()
+    message = [
+      'You do not have udev support enabled. It is strongly recommended',
+      'that you enable udev support if your platform supports it as it is',
+      'the primary method used to detect hardware audio devices (on Linux)',
+      'and is thus a critical part of PulseAudio on that platform.',
+    ]
+    warning('\n' + '\n'.join(message))
+  endif
+  if not speex_dep.found()
+    message = [
+      'You do not have speex support enabled. It is strongly recommended',
+      'that you enable speex support if your platform supports it as it is',
+      'the primary method used for audio resampling and is thus a critical',
+      'part of PulseAudio on that platform.',
+    ]
+    warning('\n' + '\n'.join(message))
+  endif
+=======
 if host_machine.system() != 'windows' and not dbus_dep.found()
   message = [
     'You do not have D-Bus support enabled. It is strongly recommended',
@@ -1073,4 +1258,5 @@ if get_option('daemon') and host_machine.system() != 'windows' and not speex_dep
     'part of PulseAudio on that platform.',
   ]
   warning('\n' + '\n'.join(message))
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 0ab985d2a..bb3b6e15a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,9 +1,12 @@
 option('daemon',
        type : 'boolean', value : true,
        description : 'Enable building and installation of pulseaudio daemon and supporting configuration files')
+<<<<<<< HEAD
+=======
 option('client',
        type : 'boolean', value : true,
        description : 'Build and install pulseaudio client libraries and utilities')
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 option('doxygen',
        type : 'boolean', value : true,
        description : 'Enable building and installation of documentation generated with doxygen')
@@ -118,7 +121,7 @@ option('gsettings',
        type : 'feature', value : 'auto',
        description : 'Optional GSettings support')
 option('gstreamer',
-       type : 'feature', value : 'auto',
+       type : 'feature', value : 'disabled',
        description : 'Optional GStreamer dependency for media-related functionality')
 option('gtk',
        type : 'feature', value : 'auto',
diff --git a/po/LINGUAS b/po/LINGUAS
index d725caead..7732c92ca 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -48,5 +48,8 @@ zh_CN
 zh_TW
 eo
 si
+<<<<<<< HEAD
+=======
 ka
 eu
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
diff --git a/po/af.po b/po/af.po
index 37c4bb1ad..9a3274ba1 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,7 +6,11 @@ msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2019-01-09 12:17+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
@@ -496,7 +500,11 @@ msgid "Line In"
 msgstr "Lyn in"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofoon"
 
@@ -517,12 +525,20 @@ msgid "Internal Microphone"
 msgstr "Interne mikrofoon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -559,12 +575,20 @@ msgid "No Bass Boost"
 msgstr "Geen basversterker"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Luidspreker"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Oorfone"
 
@@ -677,7 +701,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Kopstuk"
 
@@ -791,7 +819,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Af"
 
@@ -805,7 +837,11 @@ msgstr "%s-afvoer"
 msgid "%s Input"
 msgstr "%s-toevoer"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -816,7 +852,11 @@ msgid ""
 "returned 0 or another value < min_avail."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -881,6 +921,52 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth-toevoer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth-afvoer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Oorfone"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Draagbaar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Kar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Hoëtroustel"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Foon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Hoëtrouspel (A2DP-teiken)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Hoëtrou-opname (A2DP-bron)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -925,21 +1011,34 @@ msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Hoëtrou-opname (A2DP-bron)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2066
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Head Unit (HSP)"
 msgstr "Kopstuk se kopeenheid (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2079
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Audio Gateway (HSP)"
 msgstr "Kopstuk se oudiodeurgang (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2092
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Head Unit (HFP)"
 msgstr "Kopstuk se kopeenheid (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Kopstuk se oudiodeurgang (HSP/HFP)"
@@ -1019,11 +1118,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr ""
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr ""
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
@@ -1046,14 +1153,24 @@ msgstr "Klank op @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tonnel vir %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tonnel na %s/%s"
@@ -1077,7 +1194,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1390,11 +1511,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Ingeboude oudio"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Ingeboude oudio"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1669,7 +1798,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr ""
@@ -1805,7 +1938,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1876,7 +2013,11 @@ msgid ""
 "specification from file."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1910,7 +2051,11 @@ msgstr ""
 msgid "Failed to set media name."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1918,11 +2063,19 @@ msgstr ""
 msgid "io_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr ""
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr ""
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1931,6 +2084,23 @@ msgstr ""
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr ""
@@ -1946,6 +2116,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -1957,7 +2128,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -1993,7 +2168,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2001,6 +2180,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2010,6 +2200,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2025,7 +2216,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2083,19 +2278,31 @@ msgstr ""
 msgid "read(): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2103,22 +2310,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2129,7 +2352,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2143,6 +2370,21 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2156,28 +2398,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "Onbekende bevel"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Lyn in"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Kopstuk"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2199,26 +2481,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Bluetooth-toevoer"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Analoë mono"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2240,37 +2540,66 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2292,6 +2621,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr ""
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2301,11 +2641,16 @@ msgid "n/a"
 msgstr ""
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2316,12 +2661,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2331,12 +2684,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2347,45 +2708,77 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2407,12 +2800,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2434,12 +2835,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2456,21 +2865,44 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2480,16 +2912,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2500,11 +2941,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr ""
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr ""
@@ -2562,10 +3066,78 @@ msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr ""
@@ -2631,6 +3203,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2638,7 +3211,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2653,7 +3230,11 @@ msgid ""
 "server\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2661,16 +3242,59 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr ""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr ""
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr ""
@@ -2708,20 +3332,84 @@ msgid "You have to specify a module index or name"
 msgstr ""
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr ""
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr ""
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
@@ -2775,35 +3463,68 @@ msgid "Invalid source output index"
 msgstr ""
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr ""
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr ""
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr ""
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr ""
@@ -2813,17 +3534,33 @@ msgid "You have to specify at least an object path and a message name"
 msgstr ""
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -2833,6 +3570,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr ""
 
diff --git a/po/as.po b/po/as.po
index 66d439589..dccde516d 100644
--- a/po/as.po
+++ b/po/as.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.as\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:52+0000\n"
 "Last-Translator: Amitakhya Phukan <aphukan@fedoraproject.org>\n"
 "Language-Team: Assamese <>\n"
@@ -169,10 +173,16 @@ msgid "--fail expects boolean argument"
 msgstr "  fail দ্বাৰা বুলিয়েন তৰ্ক প্ৰত্যাশিত"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "  log level ৰ কাৰণে লগ স্তৰৰ তৰ্ক প্ৰত্যাশিত (হয় সংখ্যা ০..৪ ৰ সীমাত বা debug, "
 "info, notice, warn, error ৰ যিকোনো এটা) ।"
@@ -589,7 +599,11 @@ msgid "Line In"
 msgstr "লাইন ইন"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "মাইক্ৰোফোন"
 
@@ -612,12 +626,20 @@ msgid "Internal Microphone"
 msgstr "অভ্যন্তৰীণ মাইক্ৰোফোন"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "ৰেডিঅ'"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "ভিডিঅ'"
 
@@ -656,12 +678,20 @@ msgid "No Bass Boost"
 msgstr "বুস্ট প্ৰয়োগ কৰা ন'হ'ব"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphones"
 msgstr "এনালগ হেড ফোন"
@@ -749,6 +779,64 @@ msgstr "নিবেশ"
 #, fuzzy
 msgid "Virtual Surround 7.1"
 msgstr "এনালগ ছাৰাউন্ড ৭.১"
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "এনালগ মোনো"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "এনালগ মোনো"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "এনালগ মোনো"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "এনালগ স্টিৰিঅ'"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "মোনো"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "স্টিৰিঅ'"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+#, fuzzy
+msgid "Speakerphone"
+msgstr "এনালগ স্টিৰিঅ'"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "এনালগ ছাৰাউন্ড ২.১"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "এনালগ ছাৰাউন্ড ৩.০"
+
+=======
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
@@ -805,6 +893,7 @@ msgstr "এনালগ ছাৰাউন্ড ২.১"
 msgid "Analog Surround 3.0"
 msgstr "এনালগ ছাৰাউন্ড ৩.০"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4582
 msgid "Analog Surround 3.1"
 msgstr "এনালগ ছাৰাউন্ড ৩.১"
@@ -901,7 +990,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "বন্ধ"
 
@@ -915,7 +1008,11 @@ msgstr "Null ফলাফল"
 msgid "%s Input"
 msgstr "নিবেশ"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -931,7 +1028,11 @@ msgstr ""
 "POLLOUT নিৰ্ধাৰিত হোৱাৰি পিছতো আমি উথিলো    কিন্তু তাৰ পিছৰ snd_pcm_avail() এ ০ "
 "দিলে বা অন্য এটা মান < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1021,6 +1122,26 @@ msgstr[1] ""
 "snd_pcm_mmap_begin() এ এটা বৰ ডাঙৰ মান ঘূৰালে: %lu bytes (%lu ms) ।\n"
 "অতি সম্ভৱ এইটো ALSA চালক '%s' ৰ এটা বাগ । অনুগ্ৰহ কৰি এই সমস্যা ALSA বিকাশকক "
 "জনাওক ।"
+<<<<<<< HEAD
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+#, fuzzy
+msgid "Bluetooth Output"
+msgstr "এনালগ নিৰ্গম"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
@@ -1039,10 +1160,30 @@ msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "এনালগ হেড ফোন"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1060,15 +1201,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High Fidelity Playback (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "হাই ফিডেলিটি ক্যাপচাৰ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1082,6 +1243,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1142,8 +1304,13 @@ msgstr ""
 "plugin name> label=<ladspa plugin label> control=<comma separated list of "
 "input control values>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1179,11 +1346,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "NULL sink ৰ সময় নিৰ্ধাৰণ"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null ফলাফল"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null ফলাফল"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "উৎস সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
@@ -1206,14 +1381,24 @@ msgstr "@HOSTNAME@ ত অ'ডিঅ'"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1245,7 +1430,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "অজানা ত্ৰুটিৰ কোড"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1432,6 +1621,102 @@ msgstr "ওপৰত কেন্দ্ৰস্থিত"
 #: src/pulse/channelmap.c:156
 msgid "Top Front Center"
 msgstr "ওপৰত সন্মুখত কেন্দ্ৰস্থিত"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:157
+msgid "Top Front Left"
+msgstr "ওপৰত সন্মুখত বাওঁফালে"
+
+#: src/pulse/channelmap.c:158
+msgid "Top Front Right"
+msgstr "ওপৰত সন্মুখত বাওঁফালে"
+
+#: src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "ওপৰত পিছত কেন্দ্ৰস্থিত"
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "ওপৰত পিছত বাওঁফালে"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "ওপৰত পিছত সোঁফালে"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(অবৈধ)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "ছাৰাউণ্ড ৪.০"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "ছাৰাউণ্ড ৪.১"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "ছাৰাউণ্ড ৫.০"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "ছাৰাউণ্ড ৫.১"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "ছাৰাউণ্ড ৭.১"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() ব্যৰ্থ: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "কুকিৰ তথ্য বিশ্লেষণ কৰিবলৈ ব্যৰ্থ"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "অজানা এক্সটেনশন '%s' ৰ বাবে বাৰ্তা প্ৰাপ্ত হৈছে"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "নিবেশ"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "Null ফলাফল"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(অবৈধ)"
+
+=======
 
 #: src/pulse/channelmap.c:157
 msgid "Top Front Left"
@@ -1527,6 +1812,7 @@ msgstr ""
 msgid "invalid"
 msgstr "(অবৈধ)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulsecore/core-util.c:1790
 #, c-format
 msgid ""
@@ -1564,11 +1850,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] লগ লক্ষ্য '%s' বৈধ নহয় ।"
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "আভ্যন্তৰীণ অ'ডিঅ'"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "আভ্যন্তৰীণ অ'ডিঅ'"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "মোডেম"
 
@@ -1844,7 +2138,11 @@ msgstr "স্ট্ৰিম ড্ৰেইন (অৰ্থাৎ ফাঁ
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "সংযোগ বিফল: %s"
@@ -2038,7 +2336,11 @@ msgstr ""
 "libpulse ৰ সৈতে সঙ্কলন কৰা হৈছে %s\n"
 "libpulse ৰ সৈতে যুক্ত %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "ক্লায়েন্টেৰ নাম '%s' বৈধ নয়"
@@ -2111,7 +2413,11 @@ msgstr ""
 "সতৰ্কবাৰ্তা: চিহ্নিত স্যাম্পেল নিৰ্ধাৰণেৰ ফাইলটিৰ তথ্য, এই ফাইলেৰৰ পৰা উপলব্ধ তথ্য "
 "দ্বাৰা প্ৰতিস্থাপিত হ'ব।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ফাইলৰ পৰা স্যাম্পেল সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ।"
 
@@ -2148,7 +2454,11 @@ msgstr "প্লে বেক"
 msgid "Failed to set media name."
 msgstr "আদেশ শাৰী বিশ্লেষণ কৰিবলৈ বিফল ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() ব্যৰ্থ।"
 
@@ -2156,11 +2466,19 @@ msgstr "pa_mainloop_new() ব্যৰ্থ।"
 msgid "io_new() failed."
 msgstr "io_new() ব্যৰ্থ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() ব্যৰ্থ।"
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() ব্যৰ্থ।"
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() ব্যৰ্থ: %s"
@@ -2169,6 +2487,23 @@ msgstr "pa_context_connect() ব্যৰ্থ: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() ব্যৰ্থ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() ব্যৰ্থ।"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() ব্যৰ্থ।"
@@ -2184,6 +2519,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2195,7 +2531,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2231,7 +2571,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2239,6 +2583,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2248,6 +2603,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2263,7 +2619,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2307,6 +2667,7 @@ msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 #, c-format
 msgid "connect(): %s"
 msgstr "connect(): %s"
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
@@ -2316,6 +2677,17 @@ msgstr "PulseAudio ডেমন kill কৰিবলৈ ব্যৰ্থ ।"
 msgid "Daemon not responding."
 msgstr "ডেমনৰ পৰা কোনো প্ৰতিক্ৰিয়া পোৱা নাযায় ।"
 
+=======
+
+#: src/utils/pacmd.c:173
+msgid "Failed to kill PulseAudio daemon."
+msgstr "PulseAudio ডেমন kill কৰিবলৈ ব্যৰ্থ ।"
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "ডেমনৰ পৰা কোনো প্ৰতিক্ৰিয়া পোৱা নাযায় ।"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
@@ -2331,17 +2703,37 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "পৰিসংখ্যান প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "বৰ্ত্তমানে ব্যৱহৃত: %u blocks containing %s bytes total.\n"
 msgstr[1] "বৰ্ত্তমানে ব্যৱহৃত: %u blocks containing %s bytes total.\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "সম্পূৰ্ণ জীৱনকালত বিতৰণ কৰা: %u blocks containing %s bytes total.\n"
+msgstr[1] "সম্পূৰ্ণ জীৱনকালত বিতৰণ কৰা: %u blocks containing %s bytes total.\n"
+
+#: src/utils/pactl.c:193
+=======
 
 #: src/utils/pactl.c:205
 #, fuzzy, c-format
@@ -2352,21 +2744,34 @@ msgstr[0] "সম্পূৰ্ণ জীৱনকালত বিতৰণ ক
 msgstr[1] "সম্পূৰ্ণ জীৱনকালত বিতৰণ কৰা: %u blocks containing %s bytes total.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "চানেকি কেশ্বৰ মাপ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "সাৰ্ভাৰ সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2377,7 +2782,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2400,6 +2809,77 @@ msgstr ""
 "অবিকল্পিত উৎস: %s\n"
 "কুকি: %08x\n"
 
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "অজ্ঞাত নিৰ্দেশ"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "লাইন ইন"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "এনালগ মোনো"
+
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2469,11 +2949,16 @@ msgstr "এনালগ মোনো"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "sink সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2512,37 +2997,66 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tপোৰ্ট:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tসক্ৰিয় পোৰ্ট: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tপোৰ্ট:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "উৎস সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2581,6 +3095,17 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2590,11 +3115,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "মডিউল সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2611,12 +3141,20 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "ক্লায়েন্ট সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2631,12 +3169,20 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "কাৰ্ড সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2653,45 +3199,77 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tপাৰ্শ্বৰূপ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tসক্ৰিয় পাৰ্শ্বৰূপ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "sink নিবেশ সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2729,12 +3307,20 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "উৎস নিৰ্গম সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2772,12 +3358,20 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "স্যাম্পেল সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2807,21 +3401,44 @@ msgstr ""
 "\tগুণ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "ব্যৰ্থতা: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() বিফল: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2831,10 +3448,30 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+#, fuzzy, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "স্যাম্পেল আপলোড কৰতে ব্যৰ্থ: %s"
+
+#: src/utils/pactl.c:1051
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channel, whereas "
+"channel(s) supported = %d\n"
+msgid_plural ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel(s) supported = %d\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:1800
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
@@ -2852,10 +3489,62 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "স্যাম্পেল আপলোড কৰতে ব্যৰ্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "সম্পূৰ্ণ হওয়াৰ পূৰ্বে ফাইল সমাপ্ত হয়েছে"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "সম্পূৰ্ণ হওয়াৰ পূৰ্বে ফাইল সমাপ্ত হয়েছে"
@@ -2905,19 +3594,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "সেৱক বৈধ নহয়"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT প্ৰাপ্ত হয়েছে, প্ৰস্থান কৰা হয়েছে।"
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "অবৈধ শব্দেৰ মাত্ৰা নিৰ্ধাৰিত"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT প্ৰাপ্ত হয়েছে, প্ৰস্থান কৰা হয়েছে।"
@@ -2931,15 +3644,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "অবৈধ শব্দেৰ মাত্ৰা নিৰ্ধাৰিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "অবৈধ শব্দেৰ মাত্ৰা নিৰ্ধাৰিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2985,6 +3750,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2992,7 +3758,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3014,7 +3784,11 @@ msgstr ""
 "to\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3025,16 +3799,55 @@ msgstr ""
 "libpulseৰ সৈতে সঙ্কলন কৰা %s\n"
 "libpulse ৰ সৈতে যুক্ত %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "স্ট্ৰিমেৰ নাম '%s' বৈধ নয়।"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "লোড কৰাৰ উদ্দেশ্যে অনুগ্ৰহ কৰি এটা স্যাম্পেল ফাইল উল্লেখ কৰুন"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "শব্দেৰ ফাইল খুলতে ব্যৰ্থ।"
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "সতৰ্কবাৰ্তা: ফাইলৰ পৰা স্যাম্পেলেৰ নিৰ্ধাৰিত মাপ নিৰ্মাণ কৰতে ব্যৰ্থ।"
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "বাজানোৰ উদ্দেশ্যে এটা স্যাম্পেল ফাইল উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "অপসাৰণেৰ উদ্দেশ্যে এটা স্যাম্পেল ফাইল উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "সিংক নিবেশ ইন্ডেক্স ও এটা সিংক নিৰ্ধাৰণ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "সোৰ্স নিৰ্গম ইন্ডেক্স ও এটা সোৰ্স নিৰ্ধাৰণ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "মডিউলেৰ নাম ও আৰ্গুমেন্ট নিৰ্ধাৰণ কৰা আবশ্যক।"
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "লোড কৰাৰ উদ্দেশ্যে অনুগ্ৰহ কৰি এটা স্যাম্পেল ফাইল উল্লেখ কৰুন"
@@ -3068,26 +3881,50 @@ msgid "You have to specify a module name and arguments."
 msgstr "মডিউলেৰ নাম ও আৰ্গুমেন্ট নিৰ্ধাৰণ কৰা আবশ্যক।"
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "মডিউল ইন্ডেক্স নিৰ্ধাৰণ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "একাধিক সিংক নিৰ্ধাৰণ কৰা যাবে না। বুলিয়েন মান নিৰ্ধাৰণ কৰা আবশ্যক।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "অবৈধ স্যাম্পেল নিৰ্ধাৰিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "একাধিক সোৰ্স নিৰ্ধাৰণ কৰা যাবে না। বুলিয়েন মান নিৰ্ধাৰণ কৰা আবশ্যক।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "কাৰ্ডেৰ নাম/ইন্ডেক্স ও এটা প্ৰোফাইলেৰ নাম উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "sink ৰ নাম/ইন্ডেক্স ও এটা পোৰ্টেৰ নাম উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "কাৰ্ডেৰ নাম/ইন্ডেক্স ও এটা প্ৰোফাইলেৰ নাম উল্লেখ কৰা আবশ্যক"
@@ -3097,33 +3934,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "sink ৰ নাম/ইন্ডেক্স ও এটা পোৰ্টেৰ নাম উল্লেখ কৰা আবশ্যক"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "বাজানোৰ উদ্দেশ্যে এটা স্যাম্পেল ফাইল উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "উৎসেৰ নাম/ইন্ডেক্স ও এটা পোৰ্টে নাম উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "উৎসেৰ নাম/ইন্ডেক্স ও এটা পোৰ্টে নাম উল্লেখ কৰা আবশ্যক"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "মডিউল ইন্ডেক্স নিৰ্ধাৰণ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "বাজানোৰ উদ্দেশ্যে এটা স্যাম্পেল ফাইল উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "sink ৰ নাম/ইন্ডেক্স ও এটা পোৰ্টেৰ নাম উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "sink ৰ নাম/ইন্ডেক্স ও এটা পোৰ্টেৰ নাম উল্লেখ কৰা আবশ্যক"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "মডিউল ইন্ডেক্স নিৰ্ধাৰণ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "উৎসেৰ নাম/ইন্ডেক্স ও এটা শব্দেৰ মাত্ৰা উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "সিংক নিবেশ ইন্ডেক্স ও শব্দেৰ মাত্ৰা নিৰ্ধাৰণ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "সিংক নিবেশ ইন্ডেক্স বৈধ নয়"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "উৎসেৰ নাম/ইন্ডেক্স ও এটা শব্দেৰ মাত্ৰা উল্লেখ কৰা আবশ্যক"
@@ -3137,83 +4010,141 @@ msgid "Invalid sink input index"
 msgstr "সিংক নিবেশ ইন্ডেক্স বৈধ নয়"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "সোৰ্স নিৰ্গম ইন্ডেক্স ও এটা সোৰ্স নিৰ্ধাৰণ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "সিংক নিবেশ ইন্ডেক্স বৈধ নয়"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "sink ৰ নাম/ইন্ডেক্স ও এটা নিঃশব্দতাৰ বুলিয়ান উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "অবৈধ স্যাম্পেল নিৰ্ধাৰিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "উৎসেৰ নাম/ইন্ডেক্স ও নিঃশব্দতাৰ বুলিয়ান উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "সিংক নিবেশ ইন্ডেক্স ও নিঃশব্দতাৰ বুলিয়ান নিৰ্ধাৰণ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "অবৈধ সিংক নিবেশ ইন্ডেক্স নিৰ্ধাৰিত"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "অবৈধ সিংক নিবেশ ইন্ডেক্স নিৰ্ধাৰিত"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "উৎসেৰ নাম/ইন্ডেক্স ও নিঃশব্দতাৰ বুলিয়ান উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "অবৈধ সিংক নিবেশ ইন্ডেক্স নিৰ্ধাৰিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "sink ৰ নাম/ইন্ডেক্স ও এটা পোৰ্টেৰ নাম উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "sink ৰ নাম/ইন্ডেক্স ও এটা নিঃশব্দতাৰ বুলিয়ান উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "কাৰ্ডেৰ নাম/ইন্ডেক্স ও এটা প্ৰোফাইলেৰ নাম উল্লেখ কৰা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "কোনো বৈধ কমান্ড নিৰ্ধাৰিত হয়নি।"
 
diff --git a/po/be.po b/po/be.po
index 9b11b0e7a..cb152b349 100644
--- a/po/be.po
+++ b/po/be.po
@@ -9,7 +9,11 @@ msgstr ""
 "Project-Id-Version: PulseAudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2016-07-19 11:06+0300\n"
 "Last-Translator: Viktar Vaŭčkievič <victorenator@gmail.com>\n"
 "Language-Team: Belarusian <>\n"
@@ -181,7 +185,10 @@ msgid "--fail expects boolean argument"
 msgstr "--fail чакае булевы аргумент"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+=======
 #, fuzzy
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
@@ -607,7 +614,11 @@ msgid "Line In"
 msgstr "Лінейны ўваход"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Мікрафон"
 
@@ -628,12 +639,20 @@ msgid "Internal Microphone"
 msgstr "Убудаваны мікрафон"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Радыё"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Відэа"
 
@@ -670,12 +689,20 @@ msgid "No Bass Boost"
 msgstr "Без ўзмацнення басоў"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Дынамік"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Навушнікі"
 
@@ -791,7 +818,11 @@ msgid "Stereo"
 msgstr "Стэрэа"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Гарнітура"
 
@@ -906,7 +937,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Адключаны"
 
@@ -920,7 +955,11 @@ msgstr "%s выхад"
 msgid "%s Input"
 msgstr "%s уваход"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -937,7 +976,11 @@ msgstr ""
 "Мы прачнуліся з устаноўленым POLLOUT, аднак наступны выклік snd_pcm_avail() "
 "вярнуў 0 або іншае значэнне, меншае за min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1051,6 +1094,71 @@ msgstr[2] ""
 "Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб "
 "гэтым распрацоўнікам ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth-уваход"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth-выхад"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Хэндс-фры"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Навушнік"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Партатыўная сістэма"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Аўтамабільная сістэма"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Hi-Fi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Тэлефон"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Прайграванне высокай якасці (A2DP-прыёмнік)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Захоп высокай якасці (A2DP-крыніца)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Навушнікі гарнітуры (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Аўдыяшлюз гарнітуры (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Навушнікі гарнітуры (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Аўдыяшлюз гарнітуры (HSP/HFP)"
+
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1114,6 +1222,7 @@ msgstr "Навушнікі гарнітуры (HSP/HFP)"
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Аўдыяшлюз гарнітуры (HSP/HFP)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
 "source_name=<name for the source> source_properties=<properties for the "
@@ -1176,6 +1285,15 @@ msgstr ""
 "сэмлаў> channels=<колькасць каналаў> channel_map=<схема каналаў> "
 "autoloaded=<зададзены, калі гэты модуль загружаны аўтаматычна> "
 "use_volume_sharing=<yes ці no> "
+<<<<<<< HEAD
+
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr ""
+
+=======
 
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
@@ -1183,6 +1301,7 @@ msgstr ""
 msgid "FFT based equalizer on %s"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/module-filter-apply.c:47
 msgid "autoclean=<automatically unload unused filters?>"
 msgstr "autoclean=<аўтаматычна выгрузіць нявыкарыстаныя фільтры?>"
@@ -1216,11 +1335,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Сінхронны пусты прыёмнік"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Пусты выхад"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Пусты выхад"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Не атрымалася задаць фармат: некарэктны фармат «%s»"
@@ -1243,14 +1370,24 @@ msgstr "Аўдыя на @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Тунэль для %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Тунэль да %s/%s"
@@ -1281,7 +1418,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Невядомы код памылкі"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1492,7 +1633,10 @@ msgstr "Верхні задні правы"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(некарэктнае)"
 
@@ -1597,11 +1741,19 @@ msgstr "Не атрымалася адкрыць файлы журнала «%s
 msgid "Invalid log target."
 msgstr "Некарэктны журнал."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Убудаванае аўдыя"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Убудаванае аўдыя"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Мадэм"
 
@@ -1877,7 +2029,11 @@ msgstr "Не атрымалася ўсталяваць маніторны пат
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() пацярпела няўдачу: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Злучэнне не ўдалося: %s"
@@ -2078,7 +2234,11 @@ msgstr ""
 "Скампілявана з libpulse %s\n"
 "Звязана з libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Некарэктная назва кліента «%s»"
@@ -2151,7 +2311,11 @@ msgstr ""
 "Папярэджанне: зададзеная спецыфікацыя сэмплаў будзе перапісана спецыфікацыяй "
 "сэмплаў з файла."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Не атрымалася вызначыць спецыфікацыю сэмплаў з файла."
 
@@ -2185,7 +2349,11 @@ msgstr "прайграванне"
 msgid "Failed to set media name."
 msgstr "Не атрымалася ўсталяваць назву патоку."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() пацярпела няўдачу."
 
@@ -2193,11 +2361,19 @@ msgstr "pa_mainloop_new() пацярпела няўдачу."
 msgid "io_new() failed."
 msgstr "io_new() пацярпела няўдачу."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() пацярпела няўдачу."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() пацярпела няўдачу."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() пацярпела няўдачу: %s"
@@ -2206,6 +2382,23 @@ msgstr "pa_context_connect() пацярпела няўдачу: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() пацярпела няўдачу."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() пацярпела няўдачу."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "НАЗВА [АРГУМЕНТЫ …]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "НАЗВА|НУМАР"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() пацярпела няўдачу."
@@ -2221,6 +2414,7 @@ msgstr "НАЗВА|НУМАР"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "НАЗВА"
 
@@ -2232,7 +2426,11 @@ msgstr "НАЗВА|НУМАР ГУЧНАСЦЬ"
 msgid "#N VOLUME"
 msgstr "НУМАР ГУЧНАСЦЬ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "НАЗВА|НУМАР 1|0"
 
@@ -2268,7 +2466,11 @@ msgstr "ШЛЯХ"
 msgid "FILENAME SINK|#N"
 msgstr "НАЗВА_ФАЙЛА ПРЫЁМНІК|НУМАР"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "НУМАР ПРЫЁМНІК|КРЫНІЦА"
 
@@ -2276,6 +2478,17 @@ msgstr "НУМАР ПРЫЁМНІК|КРЫНІЦА"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "КАРТКА ПРОФІЛЬ"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "НАЗВА|НУМАР ПОРТ"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "КАРТКА ПРОФІЛЬ"
@@ -2285,6 +2498,7 @@ msgid "NAME|#N PORT"
 msgstr "НАЗВА|НУМАР ПОРТ"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "НАЗВА_КАРТКІ|№_КАРТЫ ПОРТ ЗРУХ"
 
@@ -2300,7 +2514,11 @@ msgstr "ЛІКАВЫ ЎЗРОВЕНЬ"
 msgid "FRAMES"
 msgstr "КАДРАЎ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2365,12 +2583,20 @@ msgstr "read(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Не атрымалася атрымаць статыстыку: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2381,7 +2607,11 @@ msgstr[1] ""
 msgstr[2] ""
 "Выкарыстоўваецца ў дадзены момант: %u блокаў агульным памерам %s байтаў.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2396,22 +2626,38 @@ msgstr[2] ""
 "Выдзелена на працягу ўсяго тэрміну службы: %u блокаў агульным памерам %s "
 "байтаў.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Памер кэшу сэмплаў: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб серверы: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2428,7 +2674,11 @@ msgstr ""
 "Нумар кліента: %u\n"
 "Памер блока: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2451,6 +2701,21 @@ msgstr ""
 "Агаданая крыніца: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2464,28 +2729,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "невядомая"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Лінейны ўваход"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Гарнітура"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2507,26 +2812,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Bluetooth-уваход"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Аналагавы мона"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб прыёмніку: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2565,37 +2888,66 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tПарты:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (прыёмнікаў: %u, крыніц: %u, прыярытэт: %u, даступны: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tАктыўны порт: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tФарматы:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб крыніцы: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2634,6 +2986,17 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "н/д"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2643,11 +3006,16 @@ msgid "n/a"
 msgstr "н/д"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб модулі: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2664,12 +3032,20 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб кліенце: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2684,12 +3060,20 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб картцы: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2706,28 +3090,48 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tПрофілі:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (прыёмнікаў: %u, крыніц: %u, прыярытэт: %u, даступны: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tАктыўны профіль: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2736,17 +3140,29 @@ msgstr ""
 "\t\t\tУласцівасці:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tЧастка профілю(яў): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб уваходзе прыёмніка: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2785,12 +3201,20 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб выхадзе крыніцы: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2829,12 +3253,20 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Не атрымалася атрымаць інфармацыю аб сэмпле: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2863,16 +3295,40 @@ msgstr ""
 "\tУласцівасці:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Няўдача: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() пацярпела няўдачу: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2887,16 +3343,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Не атрымалася выгрузіць модуль: модуль не загружаны"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2914,11 +3379,74 @@ msgstr[2] ""
 "Не атрымалася задаць гучнасць: вы спрабуеце задаць гучнасць для %d каналаў, "
 "але агульная колькасць каналаў %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Не атрымалася выгрузіць сэмпл: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Заўчасны канец файла"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "зʼяўленне"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "змяненне"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "выдаленне"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "невядомая"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "прыёмніка"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "крыніцы"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "уваходу прыёмніка"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "выхаду крыніцы"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "модуля"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "кліента"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "кэша сэмплаў"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "сервера"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "карткі"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Заўчасны канец файла"
@@ -2976,10 +3504,78 @@ msgid "card"
 msgstr "карткі"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Падзея %s %s № %u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Атрыманы сігнал SIGINT — выхад."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Некарэктная гучнасць"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Гучнасць па-за дапушчальны дыяпазоне.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Некарэктная колькасць значэнняў гучнасці.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Супярэчлівае значэнне гучнасці.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[параметры]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[ТЫП]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "НАЗВА_ФАЙЛА [НАЗВА]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "НАЗВА [ПРЫЁМНІК]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "НАЗВА|НУМАР ГУЧНАСЦЬ [ГУЧНАСЦЬ …]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "НУМАР ГУЧНАСЦЬ [ГУЧНАСЦЬ …]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "НАЗВА|НУМАР 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "НУМАР 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "НУМАР ФАРМАТЫ"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Атрыманы сігнал SIGINT — выхад."
@@ -3045,6 +3641,7 @@ msgid "#N FORMATS"
 msgstr "НУМАР ФАРМАТЫ"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3056,8 +3653,13 @@ msgstr ""
 "могуць быць скарыстаны для ўказання агаданага прыёмніка, крыніцы ці "
 "манітора.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3077,7 +3679,11 @@ msgstr ""
 "  -s, --server=СЕРВЕР                   Назва сервера для злучэння\n"
 "  -n, --client-name=НАЗВА               Назва гэтага кліента на серверы\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3088,16 +3694,59 @@ msgstr ""
 "Скампілявана з libpulse %s\n"
 "Звязана з libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Некарэктная назва патоку «%s»"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Нічога не задавайце ці адно з: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Калі ласка, задайце файл сэмплаў для загрузкі"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Не атрымалася адкрыць аўдыяфайл."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Папярэджанне: Не атрымалася вызначыць спецыфікацыю сэмплаў з файла."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Неабходна задаць назву сэмпла для прайгравання"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Неабходна задаць назву сэмпла для выдалення"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Неабходна задаць нумар уваходу прыёмніка і прыёмнік"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Неабходна задаць нумар выхаду крыніцы і крыніцу"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Неабходна задаць назву модуля і аргументы."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Неабходна задаць нумар модуля ці яго назву"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Калі ласка, задайце файл сэмплаў для загрузкі"
@@ -3135,22 +3784,54 @@ msgid "You have to specify a module index or name"
 msgstr "Неабходна задаць нумар модуля ці яго назву"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Вы не можаце задаць больш аднаго прыёмніка. Неабходна задаць булева значэнне."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Некарэктная спецыфікацыя прыпынення."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Некарэктная спецыфікацыя прыпынення."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "Вы не можаце задаць больш адной крыніцы. Неабходна задаць булева значэнне."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Неабходна задаць нумар ці назву карткі і назву профілю"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Неабходна задаць нумар ці назву прыёмніка і назву порта"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Неабходна задаць назву прыёмніка"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Неабходна задаць нумар ці назву крыніцы і назву порта"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Неабходна задаць назву крыніцы"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Неабходна задаць нумар ці назву карткі і назву профілю"
@@ -3172,19 +3853,51 @@ msgid "You have to specify a source name"
 msgstr "Неабходна задаць назву крыніцы"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Неабходна задаць назву прыёмніка"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Неабходна задаць нумар ці назву прыёмніка і гучнасць"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Неабходна задаць нумар ці назву прыёмніка і гучнасць"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Неабходна задаць назву крыніцы"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Неабходна задаць нумар ці назву крыніцы і гучнасць"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Неабходна задаць нумар ўваходу прыёмніка і гучнасць"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Некарэктны нумар уваходу прыёмніка"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Неабходна задаць нумар выхаду крыніцы і гучнасць"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Некарэктны нумар выхаду крыніцы"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Неабходна задаць нумар ці назву крыніцы і гучнасць"
@@ -3206,36 +3919,58 @@ msgid "Invalid source output index"
 msgstr "Некарэктны нумар выхаду крыніцы"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Неабходна задаць нумар ці назву прыёмніка і дзеянне абязгучвання (0 — "
 "адключыць, 1 — уключыць, toggle — пераключыць)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Некарэктная спецыфікацыя абязгучвання"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Некарэктная спецыфікацыя абязгучвання"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Неабходна задаць нумар ці назву крыніцы і дзеянне абязгучвання (0 — "
 "адключыць, 1 — уключыць, toggle — пераключыць)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Неабходна задаць нумар уваходу прыёмніка і дзеянне абязгучвання (0 — "
 "адключыць, 1 — уключыць, toggle — пераключыць)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Некарэктны нумар уваходу прыёмніка"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Некарэктны нумар уваходу прыёмніка"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3243,22 +3978,38 @@ msgstr ""
 "Неабходна задаць нумар выхаду крыніцы і дзеянне абязгучвання (0 — адключыць, "
 "1 — уключыць, toggle — пераключыць)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Некарэктны нумар выхаду крыніцы"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Некарэктны нумар выхаду крыніцы"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Неабходна задаць нумар ці назву прыёмніка і назву порта"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3266,6 +4017,17 @@ msgstr ""
 "Неабходна задаць нумар прыёмніка і спіс фарматаў, падзеленых кропкамі з "
 "коскамі"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "Неабходна задаць нумар ці назву карткі, назву порту і зрух затрымкі."
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Немагчыма разабраць зрух затрымкі"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Неабходна задаць нумар ці назву карткі, назву порту і зрух затрымкі."
@@ -3275,6 +4037,7 @@ msgid "Could not parse latency offset"
 msgstr "Немагчыма разабраць зрух затрымкі"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Зададзена некарэктная каманда."
 
diff --git a/po/bg.po b/po/bg.po
index 4f925c9e6..760c1a019 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,7 +4,11 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2020-10-15 21:30+0000\n"
 "Last-Translator: Emanuil Novachev <em.novachev@gmail.com>\n"
 "Language-Team: Bulgarian <https://translate.fedoraproject.org/projects/"
@@ -163,7 +167,10 @@ msgid "--fail expects boolean argument"
 msgstr "--fail очаква булева стойност"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+=======
 #, fuzzy
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
@@ -564,7 +571,11 @@ msgid "Line In"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr ""
 
@@ -585,12 +596,20 @@ msgid "Internal Microphone"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr ""
 
@@ -627,12 +646,20 @@ msgid "No Bass Boost"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr ""
 
@@ -654,12 +681,21 @@ msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2808
 msgid "Headphones 2"
+<<<<<<< HEAD
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2809
 msgid "Headphones Mono Output"
 msgstr ""
 
+=======
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2809
+msgid "Headphones Mono Output"
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:2810
 msgid "Line Out"
 msgstr ""
@@ -690,6 +726,7 @@ msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2817
 msgid "Multichannel Output"
+<<<<<<< HEAD
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2818
@@ -704,6 +741,22 @@ msgstr ""
 msgid "Chat Input"
 msgstr ""
 
+=======
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2818
+msgid "Game Output"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+msgid "Chat Output"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr ""
@@ -740,7 +793,11 @@ msgid "Stereo"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -853,7 +910,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr ""
 
@@ -867,7 +928,11 @@ msgstr ""
 msgid "%s Input"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -878,7 +943,11 @@ msgid ""
 "returned 0 or another value < min_avail."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -943,6 +1012,67 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr ""
+
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1002,6 +1132,7 @@ msgstr ""
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
 "source_name=<name for the source> source_properties=<properties for the "
@@ -1046,8 +1177,13 @@ msgid ""
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1077,11 +1213,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr ""
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr ""
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
@@ -1104,14 +1248,24 @@ msgstr ""
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1135,6 +1289,16 @@ msgstr ""
 msgid "Unknown device model"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr ""
+
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr ""
@@ -1143,6 +1307,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr ""
@@ -1346,7 +1511,10 @@ msgstr ""
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr ""
 
@@ -1448,11 +1616,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr ""
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr ""
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr ""
 
@@ -1727,7 +1903,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr ""
@@ -1863,7 +2043,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1934,7 +2118,11 @@ msgid ""
 "specification from file."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1968,7 +2156,11 @@ msgstr ""
 msgid "Failed to set media name."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1976,11 +2168,19 @@ msgstr ""
 msgid "io_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr ""
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr ""
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1989,6 +2189,23 @@ msgstr ""
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr ""
@@ -2004,6 +2221,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2015,7 +2233,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2051,7 +2273,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2059,6 +2285,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2068,6 +2305,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2083,7 +2321,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2141,19 +2383,31 @@ msgstr ""
 msgid "read(): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2161,22 +2415,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2187,7 +2457,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2201,6 +2475,74 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr ""
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr ""
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2267,11 +2609,16 @@ msgstr ""
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2293,11 +2640,38 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr ""
+
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+#, c-format
+msgid "\tFormats:\n"
+msgstr ""
+
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2319,11 +2693,16 @@ msgstr ""
 
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2345,6 +2724,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr ""
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2354,11 +2744,16 @@ msgid "n/a"
 msgstr ""
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2369,12 +2764,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2384,12 +2787,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2398,6 +2809,44 @@ msgid ""
 "\tOwner Module: %s\n"
 "\tProperties:\n"
 "\t\t%s\n"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/utils/pactl.c:657
+#, c-format
+msgid "\tProfiles:\n"
+msgstr ""
+
+#: src/utils/pactl.c:659
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:664
+#, c-format
+msgid "\tActive Profile: %s\n"
+msgstr ""
+
+#: src/utils/pactl.c:673
+#, c-format
+msgid ""
+"\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:679
+#, c-format
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:684
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 msgstr ""
 
 #: src/utils/pactl.c:1238
@@ -2434,11 +2883,16 @@ msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2460,12 +2914,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2487,12 +2949,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2509,16 +2979,40 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2533,16 +3027,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2553,11 +3056,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr ""
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr ""
@@ -2615,10 +3181,78 @@ msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr ""
@@ -2684,6 +3318,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2691,22 +3326,33 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -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 ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2714,16 +3360,59 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr ""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr ""
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr ""
@@ -2761,20 +3450,84 @@ msgid "You have to specify a module index or name"
 msgstr ""
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr ""
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr ""
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
@@ -2828,35 +3581,68 @@ msgid "Invalid source output index"
 msgstr ""
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr ""
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr ""
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr ""
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr ""
@@ -2866,17 +3652,33 @@ msgid "You have to specify at least an object path and a message name"
 msgstr ""
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -2886,6 +3688,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr ""
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index adfd8001e..496d9576d 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.bn_IN\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:52+0000\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
@@ -178,10 +182,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail দ্বারা বুলিয়ান আর্গুমেন্ট প্রত্যাশিত"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level-র ক্ষেত্রে লগ স্তরের আর্গুমেন্ট প্রত্যাশিত (0..4 সীমার মধ্যে একটি সংখ্যা "
 "অথবা debug, info, notice, warn, ও error-র মধ্যে একটি মান)।"
@@ -601,7 +611,11 @@ msgid "Line In"
 msgstr "লাইন-ইন"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "মাইক্রোফোন"
 
@@ -624,12 +638,20 @@ msgid "Internal Microphone"
 msgstr "অভ্যন্তরীণ মাইক্রোফোন"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "রেডিও"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "ভিডিও"
 
@@ -668,12 +690,20 @@ msgid "No Bass Boost"
 msgstr "বুস্ট প্রয়োগ করা হবে না"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "অ্যানালগ হেড-ফোন"
 
@@ -789,6 +819,79 @@ msgstr "অ্যানালগ স্টিরিও"
 #: src/pulse/channelmap.c:770
 msgid "Mono"
 msgstr "মোনো"
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "স্টিরিও"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+#, fuzzy
+msgid "Speakerphone"
+msgstr "অ্যানালগ স্টিরিও"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "অ্যানালগ সারাউন্ড ২.১"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "অ্যানালগ সারাউন্ড ৩.০"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "অ্যানালগ সারাউন্ড ৩.১"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "অ্যানালগ সারাউন্ড ৪.০"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "অ্যানালগ সারাউন্ড ৪.১"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "অ্যানালগ সারাউন্ড ৫.০"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "অ্যানালগ সারাউন্ড ৫.১"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "অ্যানালগ সারাউন্ড ৬.০"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "অ্যানালগ সারাউন্ড ৬.১"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "অ্যানালগ সারাউন্ড ৭.০"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "অ্যানালগ সারাউন্ড ৭.১"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "ডিজিট্যাল স্টিরিও (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "ডিজিট্যাল সারাউন্ড ৪.০ (IEC958/AC3)"
+
+=======
 
 #: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
 msgid "Stereo"
@@ -860,6 +963,7 @@ msgstr "ডিজিট্যাল স্টিরিও (IEC958)"
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "ডিজিট্যাল সারাউন্ড ৪.০ (IEC958/AC3)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4593
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "ডিজিট্যাল সারাউন্ড ৫.১ (IEC958/AC3)"
@@ -912,7 +1016,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "বন্ধ"
 
@@ -926,7 +1034,11 @@ msgstr "Null ফলাফল"
 msgid "%s Input"
 msgstr "ইনপুট"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -943,7 +1055,11 @@ msgstr ""
 "POLLOUT set দ্বারা চেতাবনী সৃষ্টি হয়েছে -- পরবর্তী snd_pcm_avail() থেকে 0 অথবা < "
 "min_avail-র থেকে কম অন্য একটি মান প্রাপ্ত হয়েছে।"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1001,6 +1117,59 @@ msgstr[1] ""
 "snd_pcm_delay() থেকে প্রাপ্ত মান অত্যাধিক বড়: %li বাইট (%s%lu ms)।\n"
 "সম্ভবত এটি ALSA ড্রাইভার '%s'-র একটি বাগ। অনুগ্রহ করে এই সমস্যা সম্বন্ধে ALSA "
 "ডিভেলপরদের সূচিত করুন।"
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-util.c:1296
+#, fuzzy, 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 ""
+"snd_pcm_avail() থেকে প্রাপ্ত মান অত্যাধিক বড়: %lu বাইট (%lu ms)।\n"
+"সম্ভবত এটি ALSA ড্রাইভার '%s'-র একটি বাগ। অনুগ্রহ করে এই সমস্যা সম্বন্ধে ALSA "
+"ডিভেলপরদের সূচিত করুন।"
+
+#: src/modules/alsa/alsa-util.c:1339
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() থেকে প্রাপ্ত মান অত্যাধিক বড়: %lu বাইট (%lu ms)।\n"
+"সম্ভবত এটি ALSA ড্রাইভার '%s'-র একটি বাগ। অনুগ্রহ করে এই সমস্যা সম্বন্ধে ALSA "
+"ডিভেলপরদের সূচিত করুন।"
+msgstr[1] ""
+"snd_pcm_mmap_begin() থেকে প্রাপ্ত মান অত্যাধিক বড়: %lu বাইট (%lu ms)।\n"
+"সম্ভবত এটি ALSA ড্রাইভার '%s'-র একটি বাগ। অনুগ্রহ করে এই সমস্যা সম্বন্ধে ALSA "
+"ডিভেলপরদের সূচিত করুন।"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+#, fuzzy
+msgid "Bluetooth Output"
+msgstr "অ্যানালগ আউটপুট"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 
 #: src/modules/alsa/alsa-util.c:1296
 #, fuzzy, c-format
@@ -1052,10 +1221,30 @@ msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "অ্যানালগ হেড-ফোন"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1073,15 +1262,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "হাই-ফিডেলিটি প্লে-ব্যাক (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "হাই-ফিডেলিটি ক্যাপচার (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1095,6 +1304,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1157,8 +1367,13 @@ msgstr ""
 "plugin name> label=<ladspa plugin label> control=<comma separated list of "
 "input control values>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1194,11 +1409,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "NULL sink-র সময় নির্ধারণ"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null ফলাফল"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null ফলাফল"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "উৎস সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
@@ -1221,14 +1444,24 @@ msgstr "@HOSTNAME@-র মধ্যে অডিও"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1260,7 +1493,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "অজানা ত্রুটির কোড"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1467,6 +1704,124 @@ msgstr "উপরে পিছনে বাঁদিকে"
 #: src/pulse/channelmap.c:162
 msgid "Top Rear Right"
 msgstr "উপরে পিছনে ডানদিকে"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(অবৈধ)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "সারাউন্ড ৪.০"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "সারাউন্ড ৪.১"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "সারাউন্ড ৫.০"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "সারাউন্ড ৫.১"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "সারাউন্ড ৭.১"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() ব্যর্থ: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "কুকির তথ্য পার্স করতে ব্যর্থ"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "অজানা এক্সটেনশন '%s'-র জন্য বার্তা প্রাপ্ত হয়েছে"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "ইনপুট"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "Null ফলাফল"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(অবৈধ)"
+
+#: src/pulsecore/core-util.c:1790
+#, 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 ""
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr ""
+
+#: src/pulsecore/core-util.h:97
+#, fuzzy
+msgid "no"
+msgstr "মোনো"
+
+#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "autospawn লক প্রয়োগ করতে ব্যর্থ।"
+
+#: src/pulsecore/log.c:165
+#, fuzzy, c-format
+msgid "Failed to open target file '%s'."
+msgstr "শব্দের ফাইল খুলতে ব্যর্থ।"
+
+#: src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: src/pulsecore/log.c:651
+#, fuzzy
+msgid "Invalid log target."
+msgstr "[%s:%u] লগ টার্গেট '%s' বৈধ নয়।"
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "অভ্যন্তরীণ অডিও"
+
+#: src/pulsecore/sink.c:3544
+=======
 
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
@@ -1584,6 +1939,7 @@ msgid "Built-in Audio"
 msgstr "অভ্যন্তরীণ অডিও"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "মোডেম"
 
@@ -1863,7 +2219,11 @@ msgstr "স্ট্রিম ড্রেইন (অর্থাৎ ফাঁ
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "সংযোগ বিফল: %s"
@@ -2059,7 +2419,11 @@ msgstr ""
 "libpulse সহযোগে কম্পাইল করা হয়েছে %s\n"
 "libpulse-র সাথে যুক্ত %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "ক্লায়েন্টের নাম '%s' বৈধ নয়"
@@ -2132,7 +2496,11 @@ msgstr ""
 "সতর্কবার্তা: চিহ্নিত স্যাম্পেল নির্ধারণের ফাইলটির তথ্য, এই ফাইলের থেকে উপলব্ধ তথ্য "
 "দ্বারা প্রতিস্থাপিত হবে।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ফাইল থেকে স্যাম্পেল সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ।"
 
@@ -2169,7 +2537,11 @@ msgstr "প্লে-ব্যাক"
 msgid "Failed to set media name."
 msgstr "কমান্ড-লাইন পার্স করতে ব্যর্থ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() ব্যর্থ।"
 
@@ -2177,11 +2549,19 @@ msgstr "pa_mainloop_new() ব্যর্থ।"
 msgid "io_new() failed."
 msgstr "io_new() ব্যর্থ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() ব্যর্থ।"
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() ব্যর্থ।"
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() ব্যর্থ: %s"
@@ -2190,6 +2570,23 @@ msgstr "pa_context_connect() ব্যর্থ: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() ব্যর্থ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() ব্যর্থ।"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() ব্যর্থ।"
@@ -2205,6 +2602,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2216,7 +2614,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2252,7 +2654,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2260,6 +2666,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2269,6 +2686,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2284,7 +2702,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2352,19 +2774,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "পরিসংখ্যান প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "বর্তমানে ব্যবহৃত: %u ব্লকের মধ্যে উপস্থিত সর্বমোট %s বাইট।\n"
 msgstr[1] "বর্তমানে ব্যবহৃত: %u ব্লকের মধ্যে উপস্থিত সর্বমোট %s বাইট।\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2374,22 +2808,38 @@ msgstr[0] ""
 msgstr[1] ""
 "সম্পূর্ণ কর্মকালের জন্য বরাদ্দ করা হয়েছে: %u ব্লকের মধ্যে উপস্থিত সর্বমোট %s বাইট।\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "স্যাম্পেল ক্যাশের মাপ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "সার্ভার সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2400,7 +2850,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2423,6 +2877,21 @@ msgstr ""
 "ডিফল্ট সোর্স: %s\n"
 "কুকি: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2436,19 +2905,73 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "অজানা কমান্ড"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "লাইন-ইন"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "অ্যানালগ মোনো"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2492,11 +3015,16 @@ msgstr "অ্যানালগ মোনো"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "sink সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2535,37 +3063,66 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tপোর্ট:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tসক্রিয় পোর্ট: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tপোর্ট:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "উৎস সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2604,6 +3161,17 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2613,11 +3181,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "মডিউল সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2634,12 +3207,20 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "ক্লায়েন্ট সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2654,12 +3235,20 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "কার্ড সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2676,45 +3265,77 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tপ্রোফাইল:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tসক্রিয় প্রোফাইল: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "sink ইনপুট সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2752,12 +3373,20 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "উৎস আউটপুট সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2795,13 +3424,21 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "স্যাম্পেল সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ: %s"
 
 # Lazy = low quality sample
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2831,21 +3468,49 @@ msgstr ""
 "\tবিবিধ বৈশিষ্ট্য:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "ব্যর্থতা: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() বিফল: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2860,11 +3525,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "স্যাম্পেল আপলোড করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2875,11 +3545,66 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "স্যাম্পেল আপলোড করতে ব্যর্থ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "সম্পূর্ণ হওয়ার পূর্বে ফাইল সমাপ্ত হয়েছে"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "সম্পূর্ণ হওয়ার পূর্বে ফাইল সমাপ্ত হয়েছে"
@@ -2929,19 +3654,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "সার্ভার বৈধ নয়"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT প্রাপ্ত হয়েছে, প্রস্থান করা হয়েছে।"
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "অবৈধ শব্দের মাত্রা নির্ধারিত"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT প্রাপ্ত হয়েছে, প্রস্থান করা হয়েছে।"
@@ -2955,15 +3704,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "অবৈধ শব্দের মাত্রা নির্ধারিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "অবৈধ শব্দের মাত্রা নির্ধারিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -3009,6 +3810,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3016,7 +3818,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3038,7 +3844,11 @@ msgstr ""
 "নাম\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3049,16 +3859,55 @@ msgstr ""
 "libpulse সহযোগে কম্পাইল করা %s\n"
 "libpulse-র সাথে যুক্ত %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "স্ট্রিমের নাম '%s' বৈধ নয়।"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "লোড করার উদ্দেশ্যে অনুগ্রহ করে একটি স্যাম্পেল ফাইল উল্লেখ করুন"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "শব্দের ফাইল খুলতে ব্যর্থ।"
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "সতর্কবার্তা: ফাইল থেকে স্যাম্পেলের নির্ধারিত মাপ নির্মাণ করতে ব্যর্থ।"
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "বাজানোর উদ্দেশ্যে একটি স্যাম্পেল ফাইল উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "অপসারণের উদ্দেশ্যে একটি স্যাম্পেল ফাইল উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "সিংক ইনপুট ইন্ডেক্স ও একটি সিংক নির্ধারণ করা আবশ্যক"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "সোর্স আউটপুট ইন্ডেক্স ও একটি সোর্স নির্ধারণ করা আবশ্যক"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "মডিউলের নাম ও আর্গুমেন্ট নির্ধারণ করা আবশ্যক।"
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "লোড করার উদ্দেশ্যে অনুগ্রহ করে একটি স্যাম্পেল ফাইল উল্লেখ করুন"
@@ -3092,26 +3941,50 @@ msgid "You have to specify a module name and arguments."
 msgstr "মডিউলের নাম ও আর্গুমেন্ট নির্ধারণ করা আবশ্যক।"
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "মডিউল ইন্ডেক্স নির্ধারণ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "একাধিক সিংক নির্ধারণ করা যাবে না। বুলিয়েন মান নির্ধারণ করা আবশ্যক।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "অবৈধ স্যাম্পেল নির্ধারিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "একাধিক সোর্স নির্ধারণ করা যাবে না। বুলিয়েন মান নির্ধারণ করা আবশ্যক।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "কার্ডের নাম/ইন্ডেক্স ও একটি প্রোফাইলের নাম উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "sink-র নাম/ইন্ডেক্স ও একটি পোর্টের নাম উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "কার্ডের নাম/ইন্ডেক্স ও একটি প্রোফাইলের নাম উল্লেখ করা আবশ্যক"
@@ -3121,33 +3994,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "sink-র নাম/ইন্ডেক্স ও একটি পোর্টের নাম উল্লেখ করা আবশ্যক"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "বাজানোর উদ্দেশ্যে একটি স্যাম্পেল ফাইল উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "উৎসের নাম/ইন্ডেক্স ও একটি পোর্টে নাম উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "উৎসের নাম/ইন্ডেক্স ও একটি পোর্টে নাম উল্লেখ করা আবশ্যক"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "মডিউল ইন্ডেক্স নির্ধারণ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "বাজানোর উদ্দেশ্যে একটি স্যাম্পেল ফাইল উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "sink-র নাম/ইন্ডেক্স ও একটি পোর্টের নাম উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "sink-র নাম/ইন্ডেক্স ও একটি পোর্টের নাম উল্লেখ করা আবশ্যক"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "মডিউল ইন্ডেক্স নির্ধারণ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "উৎসের নাম/ইন্ডেক্স ও একটি শব্দের মাত্রা উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "সিংক ইনপুট ইন্ডেক্স ও শব্দের মাত্রা নির্ধারণ করা আবশ্যক"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "সিংক ইনপুট ইন্ডেক্স বৈধ নয়"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "উৎসের নাম/ইন্ডেক্স ও একটি শব্দের মাত্রা উল্লেখ করা আবশ্যক"
@@ -3161,83 +4070,141 @@ msgid "Invalid sink input index"
 msgstr "সিংক ইনপুট ইন্ডেক্স বৈধ নয়"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "সোর্স আউটপুট ইন্ডেক্স ও একটি সোর্স নির্ধারণ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "সিংক ইনপুট ইন্ডেক্স বৈধ নয়"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "sink-র নাম/ইন্ডেক্স ও একটি নিঃশব্দতার বুলিয়ান উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "অবৈধ স্যাম্পেল নির্ধারিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "উৎসের নাম/ইন্ডেক্স ও নিঃশব্দতার বুলিয়ান উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "সিংক ইনপুট ইন্ডেক্স ও নিঃশব্দতার বুলিয়ান নির্ধারণ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "অবৈধ সিংক ইনপুট ইন্ডেক্স নির্ধারিত"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "অবৈধ সিংক ইনপুট ইন্ডেক্স নির্ধারিত"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "উৎসের নাম/ইন্ডেক্স ও নিঃশব্দতার বুলিয়ান উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "অবৈধ সিংক ইনপুট ইন্ডেক্স নির্ধারিত"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "sink-র নাম/ইন্ডেক্স ও একটি পোর্টের নাম উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "sink-র নাম/ইন্ডেক্স ও একটি নিঃশব্দতার বুলিয়ান উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "কার্ডের নাম/ইন্ডেক্স ও একটি প্রোফাইলের নাম উল্লেখ করা আবশ্যক"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "কোনো বৈধ কমান্ড নির্ধারিত হয়নি।"
 
diff --git a/po/ca.po b/po/ca.po
index 01c119c8b..a27c46947 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -28,11 +28,18 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2012-01-30 09:52+0000\n"
+"Last-Translator: Josep Torné Llavall <josep.torne@gmail.com>\n"
+"Language-Team: Catalan <fedora@softcatala.net>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-09-26 14:19+0000\n"
 "Last-Translator: Toni Estevez <toni.estevez@gmail.com>\n"
 "Language-Team: Catalan <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/ca/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -203,6 +210,23 @@ msgid "--fail expects boolean argument"
 msgstr "--fail necessita un argument booleà"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+msgstr ""
+"--log-level necessita un argument de nivell de log (valor númeric 0..4 o "
+"debug, info, notice, warn, error)."
+
+#: src/daemon/cmdline.c:277
+msgid "--high-priority expects boolean argument"
+msgstr "--high-priority necessita un argument booleà"
+
+#: src/daemon/cmdline.c:285
+msgid "--realtime expects boolean argument"
+msgstr "--realtime necessita un argument booleà"
+
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
@@ -219,6 +243,7 @@ msgstr "--high-priority necessita un argument booleà"
 msgid "--realtime expects boolean argument"
 msgstr "--realtime necessita un argument booleà"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/cmdline.c:293
 msgid "--disallow-module-loading expects boolean argument"
 msgstr "--disallow-module-loading necessita un argument booleà"
@@ -233,6 +258,7 @@ msgstr "--use-pid-file necessita un argument booleà"
 
 #: src/daemon/cmdline.c:328
 #, fuzzy
+<<<<<<< HEAD
 msgid ""
 "Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
 "valid file name 'file:<path>', 'newfile:<path>'."
@@ -402,6 +428,177 @@ msgstr "Ruta: %s\n"
 msgid "Failed to open module %s: %s"
 msgstr "No s'ha pogut obrir el mòdul %s: %s"
 
+=======
+msgid ""
+"Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
+msgstr "Objectiu de log invàlid: utilitzeu 'syslog', 'stderr' o 'auto'."
+
+#: src/daemon/cmdline.c:330
+msgid ""
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
+"name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+
+#: src/daemon/cmdline.c:338
+msgid "--log-time expects boolean argument"
+msgstr "--logtime necessita un argument booleà"
+
+#: src/daemon/cmdline.c:346
+msgid "--log-meta expects boolean argument"
+msgstr "--log-meta necessita un argument booleà"
+
+#: src/daemon/cmdline.c:366
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "Mètode de remostratge invàlid '%s'."
+
+#: src/daemon/cmdline.c:373
+msgid "--system expects boolean argument"
+msgstr "--system necessita un argument booleà"
+
+#: src/daemon/cmdline.c:381
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "--no-cpu-limit necessita un argument booleà"
+
+#: src/daemon/cmdline.c:389
+msgid "--disable-shm expects boolean argument"
+msgstr "--disable-shm necessita un argument booleà"
+
+#: src/daemon/cmdline.c:397
+#, fuzzy
+msgid "--enable-memfd expects boolean argument"
+msgstr "--realtime necessita un argument booleà"
+
+#: src/daemon/daemon-conf.c:270
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] Destí de registre incorrecte '%s'"
+
+#: src/daemon/daemon-conf.c:285
+#, c-format
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] Nivell de registre incorrecte '%s'."
+
+#: src/daemon/daemon-conf.c:300
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] Mètode de remostreig incorrecte '%s'."
+
+#: src/daemon/daemon-conf.c:322
+#, c-format
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] rlimit incorrecte '%s'."
+
+#: src/daemon/daemon-conf.c:342
+#, c-format
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr "[%s:%u] Format de mostra incorrecte '%s'."
+
+#: src/daemon/daemon-conf.c:359 src/daemon/daemon-conf.c:376
+#, c-format
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr "[%s:%u] Velocitat de mostreig '%s'."
+
+#: src/daemon/daemon-conf.c:399
+#, c-format
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr "[%s:%u] Canals de mostreig incorrectes '%s'."
+
+#: src/daemon/daemon-conf.c:416
+#, c-format
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr "[%s:%u] Mapa de canals incorrecte '%s'."
+
+#: src/daemon/daemon-conf.c:433
+#, c-format
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr "[%s:%u] Nombre de fragments incorrecte '%s'."
+
+#: src/daemon/daemon-conf.c:450
+#, c-format
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr "[%s:%u] Mida de fragment incorrecta '%s'."
+
+#: src/daemon/daemon-conf.c:467
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr "[%s:%u] Nivell de prioritat incorrecte '%s'."
+
+#: src/daemon/daemon-conf.c:552
+#, c-format
+msgid "[%s:%u] Invalid server type '%s'."
+msgstr "[%s:%u] Tipus incorrecte de servidor «%s»."
+
+#: src/daemon/daemon-conf.c:685
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "Error en obrir el fitxer de configuració: %s"
+
+#: src/daemon/daemon-conf.c:701
+msgid ""
+"The specified default channel map has a different number of channels than "
+"the specified default number of channels."
+msgstr ""
+"El mapa de canals especificat per omissió té un número de canals diferent "
+"del número de canals especificat per omissió."
+
+#: src/daemon/daemon-conf.c:788
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### Lectura del fitxer de configuració: %s ###\n"
+
+#: src/daemon/dumpmodules.c:57
+#, c-format
+msgid "Name: %s\n"
+msgstr "Nom: %s\n"
+
+#: src/daemon/dumpmodules.c:60
+#, c-format
+msgid "No module information available\n"
+msgstr "No hi ha informació del mòdul disponible\n"
+
+#: src/daemon/dumpmodules.c:63
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versió: %s\n"
+
+#: src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Description: %s\n"
+msgstr "Descripció: %s\n"
+
+#: src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Utilització: %s\n"
+
+#: src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Càrrega: %s\n"
+
+#: src/daemon/dumpmodules.c:72
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "Advertència d'obsolescència: %s\n"
+
+#: src/daemon/dumpmodules.c:76
+#, c-format
+msgid "Path: %s\n"
+msgstr "Ruta: %s\n"
+
+#: src/daemon/ltdl-bind-now.c:75
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "No s'ha pogut obrir el mòdul %s: %s"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/ltdl-bind-now.c:126
 msgid "Failed to find original lt_dlopen loader."
 msgstr "No s'ha trobat el carregador lt_dlopen original."
@@ -554,6 +751,270 @@ msgstr "S'ha produït un error en iniciar el dimoni."
 #, c-format
 msgid "setsid() failed: %s"
 msgstr "Ha fallat setsid(): %s"
+<<<<<<< HEAD
+
+#: src/daemon/main.c:1119
+msgid "Failed to get machine ID"
+msgstr "No s'ha pogut obtenir l'ID de la màquina"
+
+#: src/daemon/main.c:1145
+#, fuzzy
+msgid ""
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\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 ""
+"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://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:1161
+msgid "pa_pid_file_create() failed."
+msgstr "S'ha produït un error en pa_pid_file_create()."
+
+#: src/daemon/main.c:1193
+msgid "pa_core_new() failed."
+msgstr "S'ha produït un error en pa_core_new()."
+
+#: src/daemon/main.c:1268
+#, fuzzy
+msgid "command line arguments"
+msgstr "Massa arguments."
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+#: src/daemon/main.c:1280
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr "El dimoni s'ha iniciat sense cap mòdul carregat, no funcionarà."
+
+#: src/daemon/pulseaudio.desktop.in:4
+msgid "PulseAudio Sound System"
+msgstr "Sistema de so PulseAudio"
+
+#: src/daemon/pulseaudio.desktop.in:5
+msgid "Start the PulseAudio Sound System"
+msgstr "Inicialitza el sistema de so PulseAudio"
+
+#: src/modules/alsa/alsa-mixer.c:2708
+msgid "Input"
+msgstr "Entrada"
+
+#: src/modules/alsa/alsa-mixer.c:2709
+msgid "Docking Station Input"
+msgstr "Entrada de l'estació d'acoblament"
+
+#: src/modules/alsa/alsa-mixer.c:2710
+msgid "Docking Station Microphone"
+msgstr "Micròfon de l'estació d'acoblament"
+
+#: src/modules/alsa/alsa-mixer.c:2711
+msgid "Docking Station Line In"
+msgstr "Entrada de línia de l'estació d'acoblament"
+
+#: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
+msgid "Line In"
+msgstr "Entrada de línia"
+
+#: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+msgid "Microphone"
+msgstr "Micròfon"
+
+#: src/modules/alsa/alsa-mixer.c:2714 src/modules/alsa/alsa-mixer.c:2798
+msgid "Front Microphone"
+msgstr "Micròfon frontal"
+
+#: src/modules/alsa/alsa-mixer.c:2715 src/modules/alsa/alsa-mixer.c:2799
+msgid "Rear Microphone"
+msgstr "Micròfon posterior"
+
+#: src/modules/alsa/alsa-mixer.c:2716
+msgid "External Microphone"
+msgstr "Micròfon extern"
+
+#: src/modules/alsa/alsa-mixer.c:2717 src/modules/alsa/alsa-mixer.c:2801
+msgid "Internal Microphone"
+msgstr "Micròfon intern"
+
+#: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+#: src/utils/pactl.c:295
+msgid "Radio"
+msgstr "Ràdio"
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:296
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/modules/alsa/alsa-mixer.c:2720
+msgid "Automatic Gain Control"
+msgstr "Control de guany automàtic"
+
+#: src/modules/alsa/alsa-mixer.c:2721
+msgid "No Automatic Gain Control"
+msgstr "Sense control de guany automàtic"
+
+#: src/modules/alsa/alsa-mixer.c:2722
+msgid "Boost"
+msgstr "Accentuació"
+
+#: src/modules/alsa/alsa-mixer.c:2723
+msgid "No Boost"
+msgstr "Sense accentuació"
+
+#: src/modules/alsa/alsa-mixer.c:2724
+msgid "Amplifier"
+msgstr "Amplificador"
+
+#: src/modules/alsa/alsa-mixer.c:2725
+msgid "No Amplifier"
+msgstr "Sense amplificador"
+
+#: src/modules/alsa/alsa-mixer.c:2726
+msgid "Bass Boost"
+msgstr "Sense accentuació dels baixos"
+
+#: src/modules/alsa/alsa-mixer.c:2727
+msgid "No Bass Boost"
+msgstr "Sense accentuació dels baixos"
+
+#: src/modules/alsa/alsa-mixer.c:2728
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+msgid "Speaker"
+msgstr "Altaveu"
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:286
+msgid "Headphones"
+msgstr "Auriculars"
+
+#: src/modules/alsa/alsa-mixer.c:2796
+msgid "Analog Input"
+msgstr "Entrada analògica"
+
+#: src/modules/alsa/alsa-mixer.c:2800
+msgid "Dock Microphone"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2802
+msgid "Headset Microphone"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2806
+msgid "Analog Output"
+msgstr "Sortida analògica"
+
+#: src/modules/alsa/alsa-mixer.c:2808
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Auriculars"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+#, fuzzy
+msgid "Headphones Mono Output"
+msgstr "Sortida mono analògica"
+
+#: src/modules/alsa/alsa-mixer.c:2810
+msgid "Line Out"
+msgstr "Sortida de línia"
+
+#: src/modules/alsa/alsa-mixer.c:2811
+msgid "Analog Mono Output"
+msgstr "Sortida mono analògica"
+
+#: src/modules/alsa/alsa-mixer.c:2812
+msgid "Speakers"
+msgstr "Altaveus"
+
+#: src/modules/alsa/alsa-mixer.c:2813
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
+
+#: src/modules/alsa/alsa-mixer.c:2814
+msgid "Digital Output (S/PDIF)"
+msgstr "Sortida digital (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2815
+msgid "Digital Input (S/PDIF)"
+msgstr "Entrada digital (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2816
+#, fuzzy
+msgid "Multichannel Input"
+msgstr "Multicanal"
+
+#: src/modules/alsa/alsa-mixer.c:2817
+#, fuzzy
+msgid "Multichannel Output"
+msgstr "Multicanal"
+
+#: src/modules/alsa/alsa-mixer.c:2818
+#, fuzzy
+msgid "Game Output"
+msgstr "Sortida %s"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "Sortida %s"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "Entrada %s"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Envoltant analògic 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "Mono analògic"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Mono analògic"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Mono analògic"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "Estèreo analògic"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "Mono"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "Estèreo"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 
 #: src/daemon/main.c:1119
 msgid "Failed to get machine ID"
@@ -814,6 +1275,7 @@ msgstr "Estèreo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Auricular"
 
@@ -880,7 +1342,11 @@ msgstr "Envoltant digital 4.0 (IEC958/AC3)"
 
 #: src/modules/alsa/alsa-mixer.c:4593
 msgid "Digital Surround 5.1 (IEC958/AC3)"
+<<<<<<< HEAD
+msgstr "Envolvent digital 5.1 (IEC958/AC3)"
+=======
 msgstr "Envoltant digital 5.1 (IEC958/AC3)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4594
 msgid "Digital Surround 5.1 (IEC958/DTS)"
@@ -896,11 +1362,19 @@ msgstr "So envoltant digital 5.1 (HDMI)"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+=======
 msgstr "Xat"
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
 msgstr "Joc"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4732
 msgid "Analog Mono Duplex"
@@ -929,7 +1403,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Inactiu"
 
@@ -943,7 +1421,11 @@ msgstr "Sortida %s"
 msgid "%s Input"
 msgstr "Entrada %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -959,6 +1441,297 @@ msgstr ""
 "d'aquest problema als desenvolupadors de l'ALSA.\n"
 "Ens han aixecat amb POLLOUT activat -- tanmateix una crida posterior a "
 "snd_pcm_avail() ha retornat 0 o un altre valor < min_avail."
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, fuzzy, 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 ""
+"Alsa ens ha cridat per a llegir dades noves del dispositiu, però no hi ha "
+"res a llegir!\n"
+"Probablement es tracta d'un error de la controladora '%s' de l'ALSA. "
+"Reporteu aquest problema als desenvolupadors de l'ALSA.\n"
+"Ens han aixecat amb POLLIN activat -- tanmateix una crida posterior a "
+"snd_pcm_avail() ha retornat 0 o un altre valor < min_avail."
+
+#: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_avail() ha retornat un valor excepcionalment gran: %lu bytes (%lu "
+"ms).\n"
+"Probablement es tracta d'un error del controlador de l'ALSA '%s'. Informeu "
+"d'aquest incident als desenvolupadors de l'ALSA."
+msgstr[1] ""
+"snd_pcm_avail() ha retornat un valor excepcionalment gran: %lu bytes (%lu "
+"ms).\n"
+"Probablement es tracta d'un error del controlador de l'ALSA '%s'. Informeu "
+"d'aquest incident als desenvolupadors de l'ALSA."
+
+#: src/modules/alsa/alsa-util.c:1249
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() ha retornat un valor excepcionalment gran: %li bytes (%s%lu "
+"ms).\n"
+"Probablement es tracta d'un error del controlador de l'ALSA '%s'. Informeu "
+"d'aquest incident als desenvolupadors de l'ALSA."
+msgstr[1] ""
+"snd_pcm_delay() ha retornat un valor excepcionalment gran: %li bytes (%s%lu "
+"ms).\n"
+"Probablement es tracta d'un error del controlador de l'ALSA '%s'. Informeu "
+"d'aquest incident als desenvolupadors de l'ALSA."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, 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 ""
+"snd_pcm_avail() ha retornat un valor excepcionalment gran: %lu bytes (%lu "
+"ms).\n"
+"Probablement es tracta d'un error del controlador d'ALSA «%s». Informeu "
+"d'aquest problema als desenvolupadors d'ALSA."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() ha retornat un valor excepcionalment gran: %lu bytes "
+"(%lu ms).\n"
+"Probablement es tracta d'un error del controlador de l'ALSA '%s'. Informeu "
+"d'aquest incident als desenvolupadors de l'ALSA."
+msgstr[1] ""
+"snd_pcm_mmap_begin() ha retornat un valor excepcionalment gran: %lu bytes "
+"(%lu ms).\n"
+"Probablement es tracta d'un error del controlador de l'ALSA '%s'. Informeu "
+"d'aquest incident als desenvolupadors de l'ALSA."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Entrada bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Sortida bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Mans lliures"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Auricular"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Cotxe"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telèfon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reproducció d'alta fidelitat (canonada A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Captura d'alta fidelitat (origen A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Passarel·la de mans lliures"
+
+#: src/modules/echo-cancel/module-echo-cancel.c:59
+#, fuzzy
+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> use_master_format=<yes "
+"or no> "
+msgstr ""
+"sink_name=<nom per al conducte> sink_properties=<propietats per al conducte> "
+"master=<nom del conducte del filtre> format=<format de mostra> rate=<ràtio "
+"de mostra> channels=<nombre de canals> channel_map=<mapa de canals> "
+"pulgin=<nom del connector ladspa> label=<etiqueta del connector ladspa> "
+"control=<llista separada per comes dels valors de control d'entrada>"
+
+#. add on profile
+#: src/modules/macosx/module-coreaudio-device.c:825
+msgid "On"
+msgstr ""
+
+#: src/modules/module-allow-passthrough.c:71
+#: src/modules/module-always-sink.c:80
+msgid "Dummy Output"
+msgstr "Sortida fingida"
+
+#: src/modules/module-always-sink.c:34
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr "Conserva sempre almenys un conducte carregat fins i tot si és el nul"
+
+#: src/modules/module-always-source.c:35
+#, fuzzy
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr "Conserva sempre almenys un conducte carregat fins i tot si és el nul"
+
+#: src/modules/module-equalizer-sink.c:68
+msgid "General Purpose Equalizer"
+msgstr ""
+
+#: src/modules/module-equalizer-sink.c:72
+#, fuzzy
+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=<nom per al conducte> sink_properties=<propietats per al conducte> "
+"master=<nom del conducte del filtre> format=<format de mostra> rate=<ràtio "
+"de mostra> channels=<nombre de canals> channel_map=<mapa de canals> "
+"pulgin=<nom del connector ladspa> label=<etiqueta del connector ladspa> "
+"control=<llista separada per comes dels valors de control d'entrada>"
+
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr ""
+
+#: src/modules/module-filter-apply.c:47
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr ""
+
+#: src/modules/module-ladspa-sink.c:50
+msgid "Virtual LADSPA sink"
+msgstr "Conducte virtual LADSPA"
+
+#: src/modules/module-ladspa-sink.c:54
+#, fuzzy
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"sink_input_properties=<properties for the sink input> master=<name of sink "
+"to filter> 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> autoloaded=<set if this module "
+"is being loaded automatically> "
+msgstr ""
+"sink_name=<nom per al conducte> sink_properties=<propietats per al conducte> "
+"master=<nom del conducte del filtre> format=<format de mostra> rate=<ràtio "
+"de mostra> channels=<nombre de canals> channel_map=<mapa de canals> "
+"pulgin=<nom del connector ladspa> label=<etiqueta del connector ladspa> "
+"control=<llista separada per comes dels valors de control d'entrada>"
+
+#: src/modules/module-null-sink.c:46
+msgid "Clocked NULL sink"
+msgstr "Conducte NULL"
+
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Sortida nul·la"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+#, fuzzy, c-format
+msgid "Failed to set format: invalid format string %s"
+msgstr "No s'ha pogut obtenir la informació de la font: %s"
+
+#: src/modules/module-rygel-media-server.c:506
+#: src/modules/module-rygel-media-server.c:544
+#: src/modules/module-rygel-media-server.c:903
+msgid "Output Devices"
+msgstr "Dispositius de sortida"
+
+#: src/modules/module-rygel-media-server.c:507
+#: src/modules/module-rygel-media-server.c:545
+#: src/modules/module-rygel-media-server.c:904
+msgid "Input Devices"
+msgstr "Dispositius d'entrada"
+
+#: src/modules/module-rygel-media-server.c:1061
+msgid "Audio on @HOSTNAME@"
+msgstr "Àudio a @HOSTNAME@"
+
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "Túnel per %s@%s"
+
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
 #, fuzzy, c-format
@@ -1248,6 +2021,7 @@ msgstr "Túnel per %s@%s"
 
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1278,6 +2052,16 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Codi d'error desconegut"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "Servidor de so PulseAudio"
+
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr ""
@@ -1286,6 +2070,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr "Servidor de so PulseAudio"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr "Frontal central"
@@ -1489,7 +2274,10 @@ msgstr "Superior posterior dreta"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(incorrecte)"
 
@@ -1543,6 +2331,187 @@ msgstr "S'ha rebut un missatge per a una extensió desconeguda '%s'"
 #: src/pulse/direction.c:37
 msgid "input"
 msgstr "entrada"
+<<<<<<< HEAD
+
+#: src/pulse/direction.c:39
+msgid "output"
+msgstr "sortida"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr "bidireccional"
+
+#: src/pulse/direction.c:43
+msgid "invalid"
+msgstr "no vàlid"
+
+#: src/pulsecore/core-util.c:1790
+#, 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 ""
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr "sí"
+
+#: src/pulsecore/core-util.h:97
+msgid "no"
+msgstr "no"
+
+#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "No s'ha pogut accedir al bloqueig d'autospawn."
+
+#: src/pulsecore/log.c:165
+#, c-format
+msgid "Failed to open target file '%s'."
+msgstr ""
+
+#: src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: src/pulsecore/log.c:651
+msgid "Invalid log target."
+msgstr ""
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Àudio intern"
+
+#: src/pulsecore/sink.c:3544
+msgid "Modem"
+msgstr "Mòdem"
+
+#: src/pulse/error.c:38
+msgid "OK"
+msgstr "D'acord"
+
+#: src/pulse/error.c:39
+msgid "Access denied"
+msgstr "S'ha denegat l'accés"
+
+#: src/pulse/error.c:40
+msgid "Unknown command"
+msgstr "Ordre desconeguda"
+
+#: src/pulse/error.c:41
+msgid "Invalid argument"
+msgstr "Argument incorrecte"
+
+#: src/pulse/error.c:42
+msgid "Entity exists"
+msgstr "L'entitat existeix"
+
+#: src/pulse/error.c:43
+msgid "No such entity"
+msgstr "No existeix l'entitat"
+
+#: src/pulse/error.c:44
+msgid "Connection refused"
+msgstr "S'ha refusat la connexió"
+
+#: src/pulse/error.c:45
+msgid "Protocol error"
+msgstr "S'ha produït un error de protocol"
+
+#: src/pulse/error.c:46
+msgid "Timeout"
+msgstr "S'ha esgotat el temps"
+
+#: src/pulse/error.c:47
+msgid "No authentication key"
+msgstr ""
+
+#: src/pulse/error.c:48
+msgid "Internal error"
+msgstr "S'ha produït un error intern"
+
+#: src/pulse/error.c:49
+msgid "Connection terminated"
+msgstr "S'ha finalitzat la connexió"
+
+#: src/pulse/error.c:50
+msgid "Entity killed"
+msgstr "S'ha matat l'entitat"
+
+#: src/pulse/error.c:51
+msgid "Invalid server"
+msgstr "Servidor incorrecte"
+
+#: src/pulse/error.c:52
+msgid "Module initialization failed"
+msgstr "Ha fallat la inicialització del mòdul"
+
+#: src/pulse/error.c:53
+msgid "Bad state"
+msgstr "Estat incorrecte"
+
+#: src/pulse/error.c:54
+msgid "No data"
+msgstr "Sense dades"
+
+#: src/pulse/error.c:55
+msgid "Incompatible protocol version"
+msgstr "Versió de protocol incorrecta"
+
+#: src/pulse/error.c:56
+msgid "Too large"
+msgstr "Massa gran"
+
+#: src/pulse/error.c:57
+msgid "Not supported"
+msgstr "No suportat"
+
+#: src/pulse/error.c:58
+msgid "Unknown error code"
+msgstr "Codi d'error desconegut"
+
+#: src/pulse/error.c:59
+msgid "No such extension"
+msgstr "No existeix l'extensió"
+
+#: src/pulse/error.c:60
+msgid "Obsolete functionality"
+msgstr "Funcionalitat obsoleta"
+
+#: src/pulse/error.c:61
+msgid "Missing implementation"
+msgstr "Manca la implementació"
+
+#: src/pulse/error.c:62
+msgid "Client forked"
+msgstr "Client bifurcat"
+
+#: src/pulse/error.c:63
+msgid "Input/Output error"
+msgstr "Error d'entrada/sortida"
+
+#: src/pulse/error.c:64
+msgid "Device or resource busy"
+msgstr "Dispositiu o recurs ocupat"
+
+#: src/pulse/sample.c:179
+#, c-format
+msgid "%s %uch %uHz"
+msgstr "%s %uch %uHz"
+
+#: src/pulse/sample.c:191
+#, c-format
+msgid "%0.1f GiB"
+msgstr "%0.1f GB"
+
+#: src/pulse/sample.c:193
+#, c-format
+msgid "%0.1f MiB"
+msgstr "%0.1f MB"
+
+=======
 
 #: src/pulse/direction.c:39
 msgid "output"
@@ -1722,6 +2691,7 @@ msgstr "%0.1f GB"
 msgid "%0.1f MiB"
 msgstr "%0.1f MB"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
@@ -1825,11 +2795,19 @@ msgstr "S'ha iniciat el flux.%s"
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
 msgstr "S'ha mogut el flux al dispositiu %s (%u, %ssuspès).%s"
+<<<<<<< HEAD
 
 #: src/utils/pacat.c:393
 msgid "not "
 msgstr "no "
 
+=======
+
+#: src/utils/pacat.c:393
+msgid "not "
+msgstr "no "
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:400
 #, c-format
 msgid "Stream buffer attributes changed.%s"
@@ -1842,11 +2820,19 @@ msgstr ""
 #: src/utils/pacat.c:421
 msgid "Cork request stack is empty: uncorking stream"
 msgstr ""
+<<<<<<< HEAD
 
 #: src/utils/pacat.c:425
 msgid "Warning: Received more uncork requests than cork requests."
 msgstr ""
 
+=======
+
+#: src/utils/pacat.c:425
+msgid "Warning: Received more uncork requests than cork requests."
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:450
 #, c-format
 msgid "Connection established.%s"
@@ -1872,6 +2858,17 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Ha fallat pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+#, c-format
+msgid "Connection failure: %s"
+msgstr "Ha fallat la connexió: %s"
+
+#: src/utils/pacat.c:557
+msgid "Got EOF."
+msgstr "S'ha llegit el fi del fitxer."
+
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
 #, c-format
 msgid "Connection failure: %s"
@@ -1881,6 +2878,7 @@ msgstr "Ha fallat la connexió: %s"
 msgid "Got EOF."
 msgstr "S'ha llegit el fi del fitxer."
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:581
 #, c-format
 msgid "pa_stream_write() failed: %s"
@@ -1890,11 +2888,19 @@ msgstr "Ha fallat pa_stream_write(): %s"
 #, c-format
 msgid "write() failed: %s"
 msgstr "Ha fallat write(): %s"
+<<<<<<< HEAD
 
 #: src/utils/pacat.c:626
 msgid "Got signal, exiting."
 msgstr "S'ha rebut un senyal, s'està sortint."
 
+=======
+
+#: src/utils/pacat.c:626
+msgid "Got signal, exiting."
+msgstr "S'ha rebut un senyal, s'està sortint."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:640
 #, c-format
 msgid "Failed to get latency: %s"
@@ -1927,9 +2933,13 @@ msgid ""
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -d, --device=DEVICE                   The name of the sink/source to "
+<<<<<<< HEAD
+"connect to\n"
+=======
 "connect to. The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and "
 "@DEFAULT_MONITOR@ can be used to specify the default sink, source and "
 "monitor respectively.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 "      --stream-name=NAME                How to call this stream on the "
@@ -2067,7 +3077,11 @@ msgstr ""
 "Compilat amb libpulse %s\n"
 "Enllaçat amb libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nom del client invàlid '%s'"
@@ -2140,7 +3154,11 @@ msgstr ""
 "Advertència: l'especificació de mostra especificada se sobreescriurà amb "
 "l'especificació del fitxer."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "No s'ha pogut determinar l'especificació de mostra del fitxer."
 
@@ -2177,7 +3195,11 @@ msgstr "reproducció"
 msgid "Failed to set media name."
 msgstr "No s'ha pogut establir el nom del mitjà."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Ha fallat el pa_mainloop_new()."
 
@@ -2185,11 +3207,19 @@ msgstr "Ha fallat el pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Ha fallat el io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Ha fallat el pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Ha fallat el pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Ha fallat pa_context_connect(): %s"
@@ -2198,6 +3228,23 @@ msgstr "Ha fallat pa_context_connect(): %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Ha fallat el pa_context_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Ha fallat el pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Ha fallat el pa_mainloop_run()."
@@ -2213,6 +3260,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2224,7 +3272,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2260,7 +3312,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2268,6 +3324,17 @@ msgstr ""
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2277,6 +3344,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2292,7 +3360,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2352,12 +3424,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "No s'han pogut obtenir les estadístiques: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2366,7 +3446,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Actualment s'estan utilitzant: %u blocs que contenen %s bytes en total.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2376,22 +3460,38 @@ msgstr[0] ""
 msgstr[1] ""
 "Allotjats durant el temps de vida: %u blocs que contenen %s bytes en total.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Mida de la memòria cau de mostres: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "No s'ha pogut obtenir la informació del servidor: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2402,7 +3502,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2425,6 +3529,21 @@ msgstr ""
 "Origen per defecte: %s\n"
 "Galeta: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2438,28 +3557,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "desconegut"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Entrada de línia"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Auricular"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2481,26 +3640,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Entrada bluetooth"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Mono analògic"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "No s'ha pogut obtenir la informació del conducte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2522,11 +3699,184 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorts:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr "\tPort actiu: %s\n"
+
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+#, c-format
+msgid "\tFormats:\n"
+msgstr "\tFormats:\n"
+
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+#, c-format
+msgid "Failed to get source information: %s"
+msgstr "No s'ha pogut obtenir la informació de la font: %s"
+
+#: src/utils/pactl.c:464
+#, 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 ""
+
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+#, c-format
+msgid "Failed to get module information: %s"
+msgstr "No s'ha pogut obtenir informació del mòdul: %s"
+
+#: src/utils/pactl.c:556
+#, c-format
+msgid ""
+"Module #%u\n"
+"\tName: %s\n"
+"\tArgument: %s\n"
+"\tUsage counter: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Mòdul #%u\n"
+"\tNom: %s\n"
+"\tArguments: %s\n"
+"\tContador d'utilització: %s\n"
+"\tPropietats:\n"
+"\t\t%s\n"
+
+#: src/utils/pactl.c:575
+#, c-format
+msgid "Failed to get client information: %s"
+msgstr "No s'ha pogut obtenir informació del client: %s"
+
+#: src/utils/pactl.c:601
+#, c-format
+msgid ""
+"Client #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Client #%u\n"
+"\tControlador: %s\n"
+"\tPropietari del mòdul: %s\n"
+"\tPropietats:\n"
+"\t\t%s\n"
+
+#: src/utils/pactl.c:618
+#, c-format
+msgid "Failed to get card information: %s"
+msgstr "No s'ha pogut obtenir la informació de la targeta: %s"
+
+#: src/utils/pactl.c:641
+#, c-format
+msgid ""
+"Card #%u\n"
+"\tName: %s\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Targeta #%u\n"
+"\tNom: %s\n"
+"\tControlador: %s\n"
+"\tPropietari del mòdul: %s\n"
+"\tPropietats:\n"
+"\t\t%s\n"
+
+#: src/utils/pactl.c:657
+#, c-format
+msgid "\tProfiles:\n"
+msgstr "\tPerfils:\n"
+
+#: src/utils/pactl.c:659
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:664
+#, c-format
+msgid "\tActive Profile: %s\n"
+msgstr "\tPerfil actiu: %s\n"
+
+#: src/utils/pactl.c:673
+#, c-format
+msgid ""
+"\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:679
+#, c-format
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
+msgstr ""
+"\t\t\tPropietats:\n"
+"\t\t\t\t%s\n"
+
+#: src/utils/pactl.c:684
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+#, c-format
+msgid "Failed to get sink input information: %s"
+msgstr "No s'ha pogut obtenir informació del conducte d'entrada: %s"
+
+#: src/utils/pactl.c:730
+#, c-format
+msgid ""
+"Sink Input #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSink: %u\n"
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2721,6 +4071,39 @@ msgid ""
 "\tOwner Module: %s\n"
 "\tClient: %s\n"
 "\tSource: %u\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+"\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"
+<<<<<<< HEAD
+"\tSink Latency: %0.0f usec\n"
+=======
+"\tSource Latency: %0.0f usec\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+#, c-format
+msgid "Failed to get source output information: %s"
+msgstr "No s'ha pogut obtenir la informació del conducte de sortida: %s"
+
+#: src/utils/pactl.c:800
+#, 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"
@@ -2731,10 +4114,7 @@ msgid ""
 "\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:1536
 #, c-format
 msgid "Failed to get sample information: %s"
@@ -2753,10 +4133,366 @@ msgid ""
 "\tSize: %s\n"
 "\tLazy: %s\n"
 "\tFilename: %s\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+#, c-format
+msgid "Failed to get sample information: %s"
+msgstr "No s'ha pogut obtenir informació de la mostra: %s"
+
+#: src/utils/pactl.c:868
+#, c-format
+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 ""
+
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+#, c-format
+msgid "Failure: %s"
+msgstr "Ha fallat: %s"
+
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "Ha fallat read(): %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr ""
+
+#: src/utils/pactl.c:1051
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channel, whereas "
+"channel(s) supported = %d\n"
+msgid_plural ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel(s) supported = %d\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/utils/pactl.c:1340
+#, c-format
+msgid "Failed to upload sample: %s"
+msgstr "No s'ha pogut pujar la mostra: %s"
+
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "S'ha trobat un fi de fitxer prematurament"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nou"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "canvia"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "suprimeix"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "desconegut"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "conducte"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "font"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+#, fuzzy
+msgid "source-output"
+msgstr "font"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "mòdul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "client"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "servidor"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "targeta"
+
+#: src/utils/pactl.c:1427
+#, c-format
+msgid "Event '%s' on %s #%u\n"
+msgstr "Esdeveniment '%s' en %s #%u\n"
+
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "S'ha rebut SIGINT, s'està sortint."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Especificació de volum invàlida"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opcions]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPUS]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+#, 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 ""
+
+#: src/utils/pactl.c:1868
+#, fuzzy, 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 ""
+"%s [opcions] ... \n"
+"\n"
+"  -h, --help                            Mostra aquesta ajuda\n"
+"      --version                         Mostra la versió\n"
+"  -s, --server=SERVIDOR                 Nom del servidor al qual connectar-"
+"se\n"
+"\n"
+
+#: src/utils/pactl.c:1909
+#, c-format
+msgid ""
+"pactl %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
+"pactl %s\n"
+"Compilat amb libpulse %s\n"
+"Enllaçat amb libpulse %s\n"
+
+#: src/utils/pactl.c:1966
+#, c-format
+msgid "Specify nothing, or one of: %s"
+msgstr ""
+
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Si us plau, especifiqueu un fitxer de mostra per a carregar"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "No s'ha pogut obrir el fitxer de so."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+"Advertiment: No s'ha pogut determinar l'especificació de mostra a partir del "
+"fitxer."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Heu d'especificar un nom de mostra a reproduir"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Heu d'especificar un nom de mostra a suprimir"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Heu d'especificar una entrada del conducte i un conducte"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Heu d'especificar un índex de font de sortida i una font"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Heu d'especificar un nom de mòdul i els seus arguments."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+msgid ""
+"You may not specify more than one sink. You have to specify a boolean value."
+msgstr ""
+"No hauríeu d'especificar més d'un conducte. Heu d'especificar un valor "
+"booleà."
+
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+msgid ""
+"You may not specify more than one source. You have to specify a boolean "
+"value."
+msgstr ""
+"No hauríeu d'especificar més d'una font. Heu d'especificar un valor booleà."
+
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Heu d'especificar un nom o un índex de targeta i un nom de perfil"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Heu d'especificar un nom o un índex de conducte i un nom de port"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Heu d'especificar un nom o un índex de font i un nom de port"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Heu d'especificar un nom o un índex de conducte i un volum"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Heu d'especificar un nom o un índex de conducte i un volum"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Heu d'especificar un nom o un índex de font i un volum"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Heu d'especificar un nom o un índex de font i un volum"
+
+#
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Heu d'especificar un índex entrada del conducte i un volum"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Índex d'entrada del conducte invàlid"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Heu d'especificar l'índex de sortida d'un origen i un volum"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Índex incorrecte de sortida de l'origen"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
 #, c-format
 msgid "Failure: %s"
@@ -3097,35 +4833,57 @@ msgid "Invalid source output index"
 msgstr "Índex incorrecte de sortida de l'origen"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Heu d'especificar un nom o un índex de conducte i un booleà de silenciat"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Especificació incorrecta de silenci"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Especificació incorrecta de silenci"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Heu d'especificar un nom o un índex de font i un booleà de silenciat"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Heu d'especificar un índex d'entrada del conducte i un booleà de silenciat"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Especificació d'índex d'entrada del conducte invàlida"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Especificació d'índex d'entrada del conducte invàlida"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
@@ -3134,23 +4892,39 @@ msgstr ""
 "Heu d'especificar el nom o l'índex de sortida d'un origen i un booleà de "
 "silenci"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "Especificació d'índex d'entrada del conducte invàlida"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Heu d'especificar un nom o un índex de conducte i un nom de port"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
@@ -3158,6 +4932,17 @@ msgid ""
 msgstr ""
 "Heu d'especificar un nom o un índex de conducte i un booleà de silenciat"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -3167,6 +4952,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Ordre especificada no vàlida."
 
diff --git a/po/cs.po b/po/cs.po
index fbb056988..8d6d6844b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2018-09-30 17:34+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
@@ -554,6 +558,7 @@ msgstr "Selhalo volání pa_core_new()."
 #, fuzzy
 msgid "command line arguments"
 msgstr "Příliš mnoho argumentů."
+<<<<<<< HEAD
 
 #: src/daemon/main.c:1275
 #, c-format
@@ -562,6 +567,16 @@ msgid ""
 "Source of commands: %s"
 msgstr ""
 
+=======
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr "Spuštění démona bez jakýchkoliv načtených modulů, běh bude odmítnut."
@@ -595,7 +610,11 @@ msgid "Line In"
 msgstr "Linkový vstup"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -616,12 +635,20 @@ msgid "Internal Microphone"
 msgstr "Interní mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Rádio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Obraz"
 
@@ -658,12 +685,20 @@ msgid "No Bass Boost"
 msgstr "Bez zdůraznění basů"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Reproduktor"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Sluchátka"
 
@@ -776,7 +811,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Náhlavní souprava"
 
@@ -890,7 +929,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Vypnuto"
 
@@ -904,7 +947,11 @@ msgstr "Výstup %s"
 msgid "%s Input"
 msgstr "Vstup %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -921,7 +968,11 @@ msgstr ""
 "Probuzení se provedlo nastavením POLLOUT – nicméně následné volání "
 "snd_pcm_avail() vrátilo 0 či jinou hodnotu < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1035,6 +1086,52 @@ msgstr[2] ""
 "S největší pravděpodobností se jedná o chybu v ovladači ALSA „%s“. Nahlaste "
 "prosím tento problém vývojářům ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Vstup přes Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Výstup přes Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Handsfree"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Sluchátko"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Přenosné zařízení"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Auto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Přehrávání s velmi věrnou reprodukcí (cíl A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Záznam s velmi věrnou reprodukcí (zdroj A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1079,21 +1176,34 @@ msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Záznam s velmi věrnou reprodukcí (zdroj A2DP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2066
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Head Unit (HSP)"
 msgstr "Náhlavní souprava (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2079
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Audio Gateway (HSP)"
 msgstr "Základna náhlavní soupravy (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2092
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Head Unit (HFP)"
 msgstr "Náhlavní souprava (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Základna náhlavní soupravy (HSP/HFP)"
@@ -1198,11 +1308,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Taktovaný prázdný cíl"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Prázdný výstup"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Prázdný výstup"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Selhalo nastavení formátu: neplatný formátovací řetězec %s"
@@ -1225,14 +1343,24 @@ msgstr "Zvuk na @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunel pro %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunel do %s/%s"
@@ -1263,7 +1391,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Neznámý model zařízení"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Standardní profil RAOP"
 
@@ -1582,11 +1714,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Neplatný cíl pro záznam."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Vnitřní zvukový systém"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Vnitřní zvukový systém"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1862,7 +2002,11 @@ msgstr "Selhalo nastavení sledovacího datového proudu: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Selhalo volání pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Spojení selhalo: %s"
@@ -2066,7 +2210,11 @@ msgstr ""
 "Zkompilováno s libpulse %s\n"
 "Slinkováno s libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Neplatný název klienta „%s“"
@@ -2138,7 +2286,11 @@ msgid ""
 msgstr ""
 "Varování: Zadaná specifikace vzorku bude nahrazena specifikací ze souboru."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Selhalo zjištění specifikace vzorku ze souboru."
 
@@ -2173,7 +2325,11 @@ msgstr "přehrávání"
 msgid "Failed to set media name."
 msgstr "Nezdařilo se nastavení názvu média."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Selhalo volání pa_mainloop_new()."
 
@@ -2181,11 +2337,19 @@ msgstr "Selhalo volání pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Selhalo volání io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Selhalo volání pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Selhalo volání pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Selhalo volání pa_context_connect(): %s"
@@ -2194,6 +2358,23 @@ msgstr "Selhalo volání pa_context_connect(): %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Selhalo volání pa_context_rttime_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Selhalo volání pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NÁZEV [ARGUMENTY…]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NÁZEV|ČÍSLO"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Selhalo volání pa_mainloop_run()."
@@ -2209,6 +2390,7 @@ msgstr "NÁZEV|ČÍSLO"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NÁZEV"
 
@@ -2220,7 +2402,11 @@ msgstr "NÁZEV|ČÍSLO HLASITOST"
 msgid "#N VOLUME"
 msgstr "ČÍSLO HLASITOST"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NÁZEV|ČÍSLO 1|0"
 
@@ -2256,7 +2442,11 @@ msgstr "CESTA"
 msgid "FILENAME SINK|#N"
 msgstr "NÁZEV_SOUBORU CÍL|ČÍSLO"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "ČÍSLO CÍL|ZDROJ"
 
@@ -2264,6 +2454,17 @@ msgstr "ČÍSLO CÍL|ZDROJ"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KARTA PROFIL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NÁZEV|ČÍSLO PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KARTA PROFIL"
@@ -2273,6 +2474,7 @@ msgid "NAME|#N PORT"
 msgstr "NÁZEV|ČÍSLO PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NÁZEV_KARTY|ČÍSLO_KARTY PORT POSUN"
 
@@ -2288,7 +2490,11 @@ msgstr "ČÍSELNÁ_ÚROVEŇ"
 msgid "FRAMES"
 msgstr "RÁMCŮ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2353,12 +2559,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Selhalo získání statistik: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2366,7 +2580,11 @@ msgstr[0] "Právě se používá: %u bloků obsahujících celkem %s bajtů.\n"
 msgstr[1] "Právě se používá: %u bloků obsahujících celkem %s bajtů.\n"
 msgstr[2] "Právě se používá: %u bloků obsahujících celkem %s bajtů.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2378,22 +2596,38 @@ msgstr[1] ""
 msgstr[2] ""
 "Za celou dobu běhu alokováno: %u bloků obsahujících celkem %s bajtů.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Velikost mezipaměti vzorků: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Selhalo získání informací o serveru: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2410,7 +2644,11 @@ msgstr ""
 "Index klienta: %u\n"
 "Velikost dlaždice: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2433,6 +2671,21 @@ msgstr ""
 "Výchozí zdroj: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2446,28 +2699,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "neznámo"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Linkový vstup"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Náhlavní souprava"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2489,26 +2782,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Vstup přes Bluetooth"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Analogové mono"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Selhalo získání informací o cíli: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2547,37 +2858,66 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorty:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (cíle: %u, zdroje: %u, priority: %u, dostupné: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktivní port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormáty:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Selhalo získání informací o zdroji: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2616,6 +2956,17 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "–"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2625,11 +2976,16 @@ msgid "n/a"
 msgstr "–"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Selhalo získání informací o modulu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2646,12 +3002,20 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Selhalo získání informací o klientu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2666,12 +3030,20 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Selhalo získání informací o kartě: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2688,28 +3060,48 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfily:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (cíle: %u, zdroje: %u, priority: %u, dostupné: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktivní profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2718,17 +3110,29 @@ msgstr ""
 "\t\t\tVlastnosti:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tSoučást profilu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Selhalo získání informací o vstupu cíle: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2767,12 +3171,20 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Selhalo získání informací o výstupu zdroje: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2811,12 +3223,20 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Selhalo získání informací o vzorku: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2845,21 +3265,44 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Selhání: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "Selhalo volání read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2869,16 +3312,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Selhalo zrušení modulu z paměti. Modul %s není načtený."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2896,11 +3348,74 @@ msgstr[2] ""
 "Selhalo nastavení hlasitosti: Zkoušíte nastavit hlasitost pro %d kanálů, "
 "zatímco podporováno je %d.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Selhalo nahrání vzorku: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Předčasný konec souboru"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nový"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "změnit"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "odstranit"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "neznámo"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "cíli"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "zdroji"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "vstupu cíle"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "výstupu zdroje"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modulu"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klientu"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "mezipaměti vzorků"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "serveru"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kartě"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Předčasný konec souboru"
@@ -2958,10 +3473,78 @@ msgid "card"
 msgstr "kartě"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Událost „%s“ na %s č. %u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Obdržen signál SIGINT, ukončuje se."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Neplatné zadání hlasitosti"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Hlasitost mimo povolený rozsah.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Neplatný počet zadání hlasitosti.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Odporující si zadání hlasitosti.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[VOLBY]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYP]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NÁZEV_SOUBORU [NÁZEV]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NÁZEV [CÍL]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NÁZEV|ČÍSLO HLASITOST [HLASITOST …]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "ČÍSLO HLASITOST [HLASITOST …]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NÁZEV|ČÍSLO 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "ČÍSLO 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "ČÍSLO FORMÁTY"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Obdržen signál SIGINT, ukončuje se."
@@ -3027,6 +3610,7 @@ msgid "#N FORMATS"
 msgstr "ČÍSLO FORMÁTY"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3037,8 +3621,13 @@ msgstr ""
 "K zadání výchozího cíle, zdroje a sledování můžete použít speciální\n"
 "názvy @DEFAULT_SINK@, @DEFAULT_SOURCE@ a @DEFAULT_MONITOR@.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3060,7 +3649,11 @@ msgstr ""
 "  -n, --client-name=NÁZEV               Jak nazývat tohoto klienta na "
 "serveru\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3071,16 +3664,59 @@ msgstr ""
 "Zkompilováno s libpulse %s\n"
 "Slinkováno s libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Neplatný název datového proudu „%s“"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Buď nezadávejte nic nebo jedno z: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Zadejte prosím soubor se vzorkem určeným k načtení"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Selhalo otevření zvukového souboru."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Varování: Selhalo zjištění specifikace vzorku ze souboru."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Je nutné zadat název vzorku, který se má přehrát"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Je nutné zadat název vzorku, který se má odstranit"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Je nutné zadat index vstupu cíle a cíl"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Je nutné zadat index výstupu zdroje a zdroj"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Je nutné zadat název modulu a argumenty"
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Je nutné zadat index nebo název modulu"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Zadejte prosím soubor se vzorkem určeným k načtení"
@@ -3118,20 +3754,52 @@ msgid "You have to specify a module index or name"
 msgstr "Je nutné zadat index nebo název modulu"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "Nelze zadat více než jeden cíl. Je nutné zadat pravdivostní hodnotu."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Neplatné zadání pozastavení."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Neplatné zadání pozastavení."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "Nelze zadat více než jeden zdroj. Je nutné zadat pravdivostní hodnotu."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Je nutné zadat název nebo index karty a název profilu"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Je nutné zadat název nebo index cíle a název portu"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Je nutné zadat název cíle"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Je nutné zadat název nebo index zdroje a název portu"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Je nutné zadat název zdroje"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Je nutné zadat název nebo index karty a název profilu"
@@ -3153,19 +3821,51 @@ msgid "You have to specify a source name"
 msgstr "Je nutné zadat název zdroje"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Je nutné zadat název cíle"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Je nutné zadat název nebo index cíle a hlasitost"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Je nutné zadat název nebo index cíle a hlasitost"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Je nutné zadat název zdroje"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Je nutné zadat název nebo index zdroje a hlasitost"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Je nutné zadat index vstupu cíle a hlasitost"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Neplatný index vstupu cíle"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Je nutné zadat index výstupu zdroje a hlasitost"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Neplatný index výstupu zdroje"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Je nutné zadat název nebo index zdroje a hlasitost"
@@ -3187,36 +3887,58 @@ msgid "Invalid source output index"
 msgstr "Neplatný index výstupu zdroje"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Je nutné upřesnit název nebo index cíle a činnost pro ztlumení (0, 1 nebo "
 "přepnutí „toggle“)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Neplatné zadání ztlumení"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Neplatné zadání ztlumení"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Je nutné zadat název nebo index zdroje a činnost pro ztlumení (0, 1 nebo "
 "přepnutí „toggle“)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Je nutné zadat index vstupu cíle a  činnost pro ztlumení (0, 1 nebo přepnutí "
 "„toggle“)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Neplatné zadání indexu vstupu cíle"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Neplatné zadání indexu vstupu cíle"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3224,22 +3946,38 @@ msgstr ""
 "Je nutné zadat index vstupu zdroje a  činnost pro ztlumení (0, 1 nebo "
 "přepnutí „toggle“)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Neplatné zadání indexu výstupu cíle"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Neplatné zadání indexu výstupu cíle"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Je nutné zadat název nebo index cíle a název portu"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3247,6 +3985,17 @@ msgstr ""
 "Je nutné zadat index cíle a středníkem oddělovaný seznam podporovaných "
 "formátů"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "Je nutné zadat název nebo index karty, název portu a posun latence"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Nezdařilo se zpracovat posun latence"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Je nutné zadat název nebo index karty, název portu a posun latence"
@@ -3256,6 +4005,7 @@ msgid "Could not parse latency offset"
 msgstr "Nezdařilo se zpracovat posun latence"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Není zadán žádný platný příkaz."
 
diff --git a/po/da.po b/po/da.po
index 37ce4d1c2..9eb57eb77 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,11 @@ msgstr ""
 "Project-Id-Version: PulseAudio master\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2021-05-21 23:01+0000\n"
 "Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
 "Language-Team: Danish <https://translate.fedoraproject.org/projects/"
@@ -596,7 +600,11 @@ msgid "Line In"
 msgstr "Line in"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -617,12 +625,20 @@ msgid "Internal Microphone"
 msgstr "Intern mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -659,12 +675,20 @@ msgid "No Bass Boost"
 msgstr "Ingen bas boost"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Højttaler"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Hovedtelefoner"
 
@@ -772,7 +796,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Headset"
 
@@ -885,7 +913,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Mono chat + 7.1 surround"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Fra"
 
@@ -899,7 +931,11 @@ msgstr "%s-output"
 msgid "%s Input"
 msgstr "%s-input"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -916,7 +952,11 @@ msgstr ""
 "Vi blev vækket med POLLOUT indstillet -- men en efterfølgende "
 "snd_pcm_avail() returnerede 0 eller en anden værdi < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1015,6 +1055,64 @@ msgstr[1] ""
 "Det er højst sandsynligt en fejl i ALSA-driveren '%s'. Rapportér det "
 "venligst til ALSA-udviklerne."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth-input"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth-output"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Håndfri"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Hovedtelefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Bærbar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Bil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Hi-fi-afspilning (A2DP-sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Hi-fi-optagelse (A2DP-kilde)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Headset-hovedenhed (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Headset-lydport (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Håndfri-hovedenhed (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1071,6 +1169,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Håndfri-hovedenhed (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Håndfri-lydport (HFP)"
 
@@ -1173,11 +1272,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Clocked NULL-sink"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null-output"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null-output"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Kunne ikke indstille format: ugyldig formatstreng %s"
@@ -1200,14 +1307,24 @@ msgstr "Lyd på @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunnel for %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunnel til %s/%s"
@@ -1238,7 +1355,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Ukendt enhedsmodel"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "RAOP standardprofil"
 
@@ -1556,11 +1677,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Ugyldigt logmål."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Indbygget lyd"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Indbygget lyd"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1835,7 +1964,11 @@ msgstr "Kunne ikke indstille monitorstrøm: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() mislykkedes: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Fejl ved forbindelse: %s"
@@ -2036,7 +2169,11 @@ msgstr ""
 "Kompileret med libpulse %s\n"
 "Linket med libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Ugyldigt klientnavn '%s'"
@@ -2108,7 +2245,11 @@ msgid ""
 msgstr ""
 "Advarsel: angivne samplespecifikation overskrives med specifikation fra fil."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Kunne ikke fastslå samplespecifikation ud fra fil."
 
@@ -2142,7 +2283,11 @@ msgstr "afspilning"
 msgid "Failed to set media name."
 msgstr "Kunne ikke indstille medienavn."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() mislykkedes."
 
@@ -2150,11 +2295,19 @@ msgstr "pa_mainloop_new() mislykkedes."
 msgid "io_new() failed."
 msgstr "io_new() mislykkedes."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() mislykkedes."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() mislykkedes."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() mislykkedes: %s"
@@ -2163,6 +2316,23 @@ msgstr "pa_context_connect() mislykkedes: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() mislykkedes."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() mislykkedes."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAVN [ARGUMENTER ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAVN|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() mislykkedes."
@@ -2178,6 +2348,7 @@ msgstr "NAVN|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAVN"
 
@@ -2189,7 +2360,11 @@ msgstr "NAME|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N LYDSTYRKE"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAVN|#N 1|0"
 
@@ -2225,7 +2400,11 @@ msgstr "STINAVN"
 msgid "FILENAME SINK|#N"
 msgstr "FILNAVN SINK|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N SINK|KILDE"
 
@@ -2233,6 +2412,17 @@ msgstr "#N SINK|KILDE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KORT PROFIL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAVN|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KORT PROFIL"
@@ -2242,6 +2432,7 @@ msgid "NAME|#N PORT"
 msgstr "NAVN|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "KORTNAVN|KORT-#N PORT FORSKYDNING"
 
@@ -2257,7 +2448,11 @@ msgstr "NUMERISK-NIVEAU"
 msgid "FRAMES"
 msgstr "FRAMES"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "MODTAGER MEDDELELSE [MEDDELELSESPARAMETRE]"
 
@@ -2323,19 +2518,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Kunne ikke hente statistik: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Bruges på nuværende tidspunkt: %u blok med i alt %s bytes.\n"
 msgstr[1] "Bruges på nuværende tidspunkt: %u blokke med i alt %s bytes.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2343,22 +2550,38 @@ msgid_plural ""
 msgstr[0] "Allokeret i hele levetiden: %u blok med i alt %s bytes.\n"
 msgstr[1] "Allokeret i hele levetiden: %u blokke med i alt %s bytes.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Størrelse på mellemlager for sample: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Kunne ikke hente information for server: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2375,7 +2598,11 @@ msgstr ""
 "Klient-indeks: %u\n"
 "Flisestørrelse: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2398,6 +2625,74 @@ msgstr ""
 "Standard kilde: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "tilgængelighed ukendt"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "tilgængelig"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "ikke tilgængelig"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Line"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mik."
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Håndsæt"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Øresnegl"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Netværk"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analog"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "tilgængelighed ukendt"
@@ -2464,11 +2759,16 @@ msgstr "Analog"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Kunne ikke hente information for sink: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2507,37 +2807,66 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorte:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (type: %s, prioritet: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", tilgængelighedsgruppe: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", tilgængelighedsgruppe: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktiv port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormater:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Kunne ikke hente information for kilde: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2576,6 +2905,17 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "-"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2585,11 +2925,16 @@ msgid "n/a"
 msgstr "-"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Kunne ikke hente information for modul: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2606,12 +2951,20 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Kunne ikke hente information for klient: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2626,12 +2979,20 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Kunne ikke hente information for kort: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2648,22 +3009,38 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfiler:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (sinks: %u, kilder: %u, prioritet: %u, tilgængelige: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktive profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
@@ -2671,7 +3048,11 @@ msgstr ""
 "\t\t%s: %s (type: %s, prioritet: %u, forsinkelse-forskydning: %<PRId64> usec"
 "%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2680,17 +3061,29 @@ msgstr ""
 "\t\t\tEgenskaber:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tDel af profil(er): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Kunne ikke hente information for sinkinput: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2729,12 +3122,20 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Kunne ikke hente information for kildeoutput: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2773,12 +3174,20 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Kunne ikke hente information for sample: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2807,41 +3216,73 @@ msgstr ""
 "\tEgenskaber:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Fejl: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Send-meddelelse mislykkedes: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr "list-handlers-meddelelse mislykkedes: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr "svar for list-handlers-meddelelse kunne ikke fortolkes korrekt"
+
+#: src/utils/pactl.c:951
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr "svar for list-handlers-meddelelse kunne ikke fortolkes korrekt"
 
 #: src/utils/pactl.c:1718
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "list-handlers message response is not a JSON array"
 msgstr "svar for list-handlers-meddelelse kunne ikke fortolkes korrekt"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr "svar for list-handlers-meddelelse kunne ikke fortolkes korrekt"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Kunne ikke udlæse modul: Modulet %s er ikke indlæst"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2856,11 +3297,74 @@ msgstr[1] ""
 "Kunne ikke indstille lydstyrke: Du prøvede at indstille lydstyrker for %d "
 "kanaler, mens kanal(er) understøttede = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Kunne ikke uploade sample: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "For tidlig slutning på fil"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "ny"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "skift"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "fjern"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "ukendt"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "sink"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "kilde"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "input for sink"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "output for kilde"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klient"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "mellemlager for sample"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kort"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "For tidlig slutning på fil"
@@ -2918,10 +3422,78 @@ msgid "card"
 msgstr "kort"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Hændelsen '%s' på %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Fik SIGINT, afslutter."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Ugyldig lydstyrkespecifikation"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Lydstyrke er udenfor det tilladte område.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ugyldigt antal lydstyrkespecifikationer.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Usammenhængende lydstyrkespecifikation.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[tilvalg]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYPE]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "FILNAVN [NAVN]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAVN [SINK]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAVN|#N LYDSTYRKE [LYDSTYRKE ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N LYDSTYRKE [LYDSTYRKE ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAVN|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATER"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Fik SIGINT, afslutter."
@@ -2987,6 +3559,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATER"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2997,8 +3570,13 @@ msgstr ""
 "De specielle navne @DEFAULT_SINK@, @DEFAULT_SOURCE@ og @DEFAULT_MONITOR@\n"
 "kan bruges til at angive standardsinken, kilde og monitor.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3020,7 +3598,11 @@ msgstr ""
 "  -n, --client-name=NAVN                Hvordan klienten skal kaldes på "
 "serveren\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3031,16 +3613,59 @@ msgstr ""
 "Kompileret med libpulse %s\n"
 "Linket med libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Ugyldigt strømnavn '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Angiv intet, eller en af: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Angiv venligst en samplefil som skal indlæses"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Kunne ikke åbne lydfil."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Advarsel: Kunne ikke fastslå samplespecifikation ud fra fil."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Du skal angive et samplenavn som skal afspilles"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Du skal angive et samplenavn som skal fjernes"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Du skal angive et sinkinput-indeks eller en sink"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Du skal angive et kildeoutput-indeks eller en kilde"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Du skal angive et modulnavn og argumenter."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Du skal angive et modulindeks eller navn"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Angiv venligst en samplefil som skal indlæses"
@@ -3078,20 +3703,52 @@ msgid "You have to specify a module index or name"
 msgstr "Du skal angive et modulindeks eller navn"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "Du må ikke angive mere end én sink. Du skal angive en boolesk værdi."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Ugyldig suspendspecifikation."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Ugyldig suspendspecifikation."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "Du må ikke angive mere end én kilde. Du skal angive en boolesk værdi."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Du skal angive et kortnavn/-indeks og et profilnavn"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Du skal angive et sinknavn/-indeks og et portnavn"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Du skal angive et sinknavn"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Du skal angive et kildenavn/-indeks og et portnavn"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Du skal angive et kildenavn"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Du skal angive et kortnavn/-indeks og et profilnavn"
@@ -3113,19 +3770,51 @@ msgid "You have to specify a source name"
 msgstr "Du skal angive et kildenavn"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Du skal angive et sinknavn"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Du skal angive et sinknavn/-indeks og en lydstyrke"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Du skal angive et sinknavn/-indeks og en lydstyrke"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Du skal angive et kildenavn"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Du skal angive et kildenavn/-indeks og en lydstyrke"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Du skal angive et sinkinput-indeks og en lydstyrke"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Ugyldigt sinkinput-indeks"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Du skal angive et kildeoutput-indeks og en lydstyrke"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Ugyldigt kildeoutput-indeks"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Du skal angive et kildenavn/-indeks og en lydstyrke"
@@ -3147,33 +3836,55 @@ msgid "Invalid source output index"
 msgstr "Ugyldigt kildeoutput-indeks"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du skal angive et sinknavn/-indeks og en mute-handling (0, 1 eller 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Ugyldig mute-specifikation"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Ugyldig mute-specifikation"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du skal angive et kildenavn/-indeks og en mute-handling (0, 1 eller 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du skal angive et sinkinput-indeks og en mute-handling (0, 1 eller 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Ugyldig specifikation for sinkinput-indeks"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Ugyldig specifikation for sinkinput-indeks"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3181,6 +3892,17 @@ msgstr ""
 "Du skal angive et kildeoutput-indeks og en mute-handling (0, 1 eller "
 "'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Ugyldig specifikation for kildeoutput-indeks"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "Du skal angive mindst en objektsti og et meddelelsesnavn"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Ugyldig specifikation for kildeoutput-indeks"
@@ -3190,6 +3912,7 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Du skal angive mindst en objektsti og et meddelelsesnavn"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
@@ -3197,7 +3920,11 @@ msgstr ""
 "Overskydende argumenter angivet — de ignoreres. Bemærk at alle "
 "meddelelsesparametre skal angives som en enkelt streng."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3205,16 +3932,28 @@ msgstr ""
 "Du skal angive et sink-indeks og en semikolonsepareret list over "
 "understøttede formater"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Du skal angive et kortnavn/-indeks, et portnavn og en forsinkelse-forskydning"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Kunne ikke fortolke forsinkelse-forskydning"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Kunne ikke fortolke forsinkelse-forskydning"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Der er ikke angivet nogen gyldig kommando."
 
diff --git a/po/de.po b/po/de.po
index bd4ce879f..4c47cb60f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,9 +14,15 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.de\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-01-09 11:36+0000\n"
+"Last-Translator: Tobias Weise <tobias.weise@web.de>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-12-06 09:20+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: German <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/de/>\n"
 "Language: de\n"
@@ -24,7 +30,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.4\n"
+=======
 "X-Generator: Weblate 4.14.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, fuzzy, c-format
@@ -217,6 +227,10 @@ msgid "--use-pid-file expects boolean argument"
 msgstr "--use-pid-file erfordert boolesche Variable"
 
 #: src/daemon/cmdline.c:328
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
 "valid file name 'file:<path>', 'newfile:<path>'."
@@ -565,6 +579,19 @@ msgid "pa_core_new() failed."
 msgstr "pa_core_new() fehlgeschlagen."
 
 #: src/daemon/main.c:1268
+<<<<<<< HEAD
+#, fuzzy
+msgid "command line arguments"
+msgstr "Zu viele Argumente."
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+=======
 msgid "command line arguments"
 msgstr "Befehlszeilenargumente"
 
@@ -575,6 +602,7 @@ msgid ""
 "Source of commands: %s"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr "Hintergrunddienst verweigert Ausführung, da keine Module geladen."
@@ -608,7 +636,11 @@ msgid "Line In"
 msgstr "Line-Eingang"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -629,12 +661,20 @@ msgid "Internal Microphone"
 msgstr "Internes Mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -671,12 +711,20 @@ msgid "No Bass Boost"
 msgstr "Keine Bassverstärkung"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Lautsprecher"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Kopfhörer"
 
@@ -697,6 +745,17 @@ msgid "Analog Output"
 msgstr "Analoge Ausgabe"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Kopfhörer"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+#, fuzzy
+msgid "Headphones Mono Output"
+msgstr "Analoge Mono-Ausgabe"
+
+=======
 msgid "Headphones 2"
 msgstr "Kopfhörer 2"
 
@@ -704,6 +763,7 @@ msgstr "Kopfhörer 2"
 msgid "Headphones Mono Output"
 msgstr "Kopfhörer Mono-Ausgabe"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:2810
 msgid "Line Out"
 msgstr "Line-Ausgang"
@@ -737,6 +797,26 @@ msgid "Multichannel Output"
 msgstr "Mehrkanalausgang"
 
 #: src/modules/alsa/alsa-mixer.c:2818
+<<<<<<< HEAD
+#, fuzzy
+msgid "Game Output"
+msgstr "%s-Ausgabe"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "%s-Ausgabe"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "%s-Eingabe"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Virtuelles Surround-Ziel"
+=======
 msgid "Game Output"
 msgstr "Spiel-Ausgabe"
 
@@ -751,18 +831,30 @@ msgstr "Chat-Eingabe"
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "Virtueller Surround 7.1"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Analog Mono"
 
 #: src/modules/alsa/alsa-mixer.c:4564
+<<<<<<< HEAD
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Analog Mono"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Analog Mono"
+=======
 msgid "Analog Mono (Left)"
 msgstr "Analog Mono (Links)"
 
 #: src/modules/alsa/alsa-mixer.c:4565
 msgid "Analog Mono (Right)"
 msgstr "Analog Mono (Rechts)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
@@ -784,13 +876,23 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Headset"
 
 #: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+<<<<<<< HEAD
+#, fuzzy
+msgid "Speakerphone"
+msgstr "Lautsprecher"
+=======
 msgid "Speakerphone"
 msgstr "Freisprecheinrichtung"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -866,11 +968,19 @@ msgstr "Digital Surround 5.1 (HDMI)"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+=======
 msgstr "Chat"
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
 msgstr "Spiel"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4732
 msgid "Analog Mono Duplex"
@@ -889,6 +999,18 @@ msgid "Multichannel Duplex"
 msgstr "Mehrkanal-Duplex"
 
 #: src/modules/alsa/alsa-mixer.c:4738
+<<<<<<< HEAD
+#, fuzzy
+msgid "Stereo Duplex"
+msgstr "Analog Stereo Duplex"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 msgid "Stereo Duplex"
 msgstr "Stereo Duplex"
 
@@ -898,6 +1020,7 @@ msgstr "Mono Chat + 7.1 Surround"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Aus"
 
@@ -911,7 +1034,11 @@ msgstr "%s-Ausgabe"
 msgid "%s Input"
 msgstr "%s-Eingabe"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -929,7 +1056,11 @@ msgstr ""
 "anschließender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
 "min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1029,6 +1160,70 @@ msgstr[1] ""
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
 "dieses Problem den ALSA-Entwicklern."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth-Eingabe"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth-Ausgabe"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Freisprecheinrichtung"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Kopfhörer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "tragbar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Auto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "High Fidelity Wiedergabe (A2DP-Ziel)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "High Fidelity Aufnahme (A2DP-Quelle)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Kopfhörer Kopf-Einheit (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Kopfhörer Audio Gateway (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Kopfhörer Kopf-Einheit (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Kopfhörer Audio Gateway (HSP/HFP)"
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1087,6 +1282,7 @@ msgstr "Freisprechanlage Kopf-Einheit (HFP)"
 #: src/modules/bluetooth/module-bluez5-device.c:2105
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Freisprechanlage Audio-Gateway (HFP)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
@@ -1149,8 +1345,13 @@ msgstr ""
 "autoloaded=<setzen, wenn dieses Modul automatisch geladen wird> "
 "use_volume_sharing=<yes oder no> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1190,11 +1391,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Getaktetes NULL-Ziel"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null-Ausgabe"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null-Ausgabe"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Format konnte nicht gesetzt werden: Formatzeichenkette %s ist ungültig"
@@ -1217,14 +1426,24 @@ msgstr "Audio auf @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunnel für %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunnel zu %s/%s"
@@ -1251,12 +1470,22 @@ msgstr ""
 "zu/left_hrir.wav "
 
 #: src/modules/raop/module-raop-discover.c:295
+<<<<<<< HEAD
+#, fuzzy
+msgid "Unknown device model"
+msgstr "Unbekannter Fehlercode"
+
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+=======
 msgid "Unknown device model"
 msgstr "Unbekanntes Gerätemodell"
 
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr "RAOP-Standardprofil"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
@@ -1465,7 +1694,10 @@ msgstr "Oben hinten rechts"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(ungültig)"
 
@@ -1573,11 +1805,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Ungültiges Protokollziel."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Internes Audio"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Internes Audio"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1857,7 +2097,11 @@ msgstr "Einrichten der Überwachung des Streams fehlgeschlagen: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Verbindungsfehler: %s"
@@ -2063,7 +2307,11 @@ msgstr ""
 "Kompiliert mit libpulse %s\n"
 "Gelinkt mit libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Ungültiger Client-Name »%s«"
@@ -2134,7 +2382,11 @@ msgid ""
 "specification from file."
 msgstr "Warnung: Beziehen der Abtastwert-Angabe aus Datei fehlgeschlagen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Beziehen der Abtastwert-Informationen der Datei fehlgeschlagen."
 
@@ -2169,7 +2421,11 @@ msgstr "abspielen"
 msgid "Failed to set media name."
 msgstr "Medienname konnte nicht gesetzt werden."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() fehlgeschlagen"
 
@@ -2177,11 +2433,19 @@ msgstr "pa_mainloop_new() fehlgeschlagen"
 msgid "io_new() failed."
 msgstr "io_new() fehlgeschlagen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() fehlgeschlagen."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() fehlgeschlagen."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_new() fehlgeschlagen: %s"
@@ -2190,6 +2454,23 @@ msgstr "pa_context_new() fehlgeschlagen: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() fehlgeschlagen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() fehlgeschlagen."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAME [ARGUMENTE …]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAME|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() fehlgeschlagen."
@@ -2205,6 +2486,7 @@ msgstr "NAME|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAME"
 
@@ -2216,7 +2498,11 @@ msgstr "NAME|#N LAUTSTÄRKE"
 msgid "#N VOLUME"
 msgstr "#N LAUTSTÄRKE"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAME|#N 1|0"
 
@@ -2252,7 +2538,11 @@ msgstr "PFADNAME"
 msgid "FILENAME SINK|#N"
 msgstr "DATEINAME ZIEL|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N ZIEL|QUELLE"
 
@@ -2260,6 +2550,17 @@ msgstr "#N ZIEL|QUELLE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KARTENPROFIL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAME|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KARTENPROFIL"
@@ -2269,6 +2570,7 @@ msgid "NAME|#N PORT"
 msgstr "NAME|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "KARTENNAME|KARTEN-#N PORT POSITION"
 
@@ -2284,7 +2586,11 @@ msgstr "NUMERISCHE STUFE"
 msgid "FRAMES"
 msgstr "FRAMES"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2349,19 +2655,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Beziehen der Statistik fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Momentane Nutzung: %u Blöcke mit insgesamt %s Bytes.\n"
 msgstr[1] "Momentane Nutzung: %u Blöcke mit insgesamt %s Bytes.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2369,22 +2687,39 @@ msgid_plural ""
 msgstr[0] "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
 msgstr[1] "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Abtast-Pufferspeichergröße: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Beziehen der Server-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2401,7 +2736,11 @@ msgstr ""
 "Client-Index: %u\n"
 "Tile-Größe: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2424,6 +2763,30 @@ msgstr ""
 "Standard-Quelle: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "unbekannt"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "Verfügbarkeit unbekannt"
@@ -2445,10 +2808,58 @@ msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Line-Eingang"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+#, fuzzy
+msgid "Handset"
+msgstr "Headset"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+#, fuzzy
+msgid "Bluetooth"
+msgstr "Bluetooth-Eingabe"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Analog Mono"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr "Mikro"
@@ -2491,11 +2902,16 @@ msgstr "Analog"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Erhalten der Ziel-Informationen fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2534,11 +2950,27 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorts:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, fuzzy, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr "\t\t%s: %s (Ziele: %u, Quellen: %u, Priorität: %u, verfügbar: %s)\n"
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2549,22 +2981,36 @@ msgid ", availability group: "
 msgstr ", Verfügbarkeitsgruppe: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktiver Port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormate:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2603,6 +3049,17 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "k. A."
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2612,11 +3069,16 @@ msgid "n/a"
 msgstr "k. A."
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Beziehen der Modul-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2633,12 +3095,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Beziehen der Client-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2653,12 +3123,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Beziehen der Karten-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2675,29 +3153,50 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfile:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (Ziele: %u, Quellen: %u, Priorität: %u, verfügbar: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktives Profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (Typ: %s, Priorität: %u, Latenzversatz: %<PRId64> usec%s%s, %s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2706,17 +3205,29 @@ msgstr ""
 "\t\t\tEigenschaften:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tTeil der/des Profil(s): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Erhalten der Ziel-Eingabe-Informationen fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2755,12 +3266,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Informationen über Quell-Ausgabe konnten nicht erhalten werden: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2799,12 +3318,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Beziehen der Abtastwert-Informationen fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2833,21 +3360,45 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "read() fehlgeschlagen: %s"
+
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
 msgstr ""
 
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2857,16 +3408,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Modul konnte nicht entladen werden: Modul %s ist nicht geladen"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2881,11 +3441,74 @@ msgstr[1] ""
 "Lautstärke konnte nicht gesetzt werden: Sie haben versucht, die Lautstärke "
 "für %d Kanäle einzustellen, aber es werden nur %d Kanäle unterstützt.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Hochladen des Sample fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Dateiende ist zu früh aufgetreten"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "neu"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "ändern"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "entfernen"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "unbekannt"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "Ziel"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "Quelle"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "Ziel-Eingabe"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "Quellen-Eingabe"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "Modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "Client"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "Sample-Pufferspeicher"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "Server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "Karte"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Dateiende ist zu früh aufgetreten"
@@ -2943,10 +3566,78 @@ msgid "card"
 msgstr "Karte"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Ereignis »%s« auf %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT empfangen, wird beendet."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Ungültige Angabe der Lautstärke"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Lautstärke ist außerhalb des einstellbaren Bereichs.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ungültige Anzahl in der Lautstärkeangabe.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Inkonsistente Angabe der Lautstärke.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[Optionen]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYP]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "DATEINAME [NAME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAME [ZIEL]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAME|#N LAUTSTÄRKE [LAUTSTÄRKE …]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N LAUTSTÄRKE [LAUTSTÄRKE …]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAME|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATE"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT empfangen, wird beendet."
@@ -3012,6 +3703,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATE"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3024,8 +3716,13 @@ msgstr ""
 "können zur Angabe des Standard-Ziels, der Standard-Quelle und der Standard-"
 "Überwachung verwendet werden.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3048,7 +3745,11 @@ msgstr ""
 "  -n, --client-name=NAME                gibt den Namen dieses Clients auf "
 "dem Server an\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3059,16 +3760,47 @@ msgstr ""
 "Kompiliert mit libpulse %s\n"
 "Gelinkt mit libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr ""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Geben Sie nichts oder eines der Folgenden an: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Geben Sie eine zu öffnende Sample-Datei an"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Öffnen der Audio-Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Warnung: Beziehen der Abtastwert-Angabe aus Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Sie müssen eine zu löschende Sample-Datei angeben"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Sie müssen einen Ziel-Eingabe-Indexwert und ein Ziel angeben"
+
+#: src/utils/pactl.c:2042
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Geben Sie eine zu öffnende Sample-Datei an"
@@ -3094,10 +3826,22 @@ msgid "You have to specify a sink input index and a sink"
 msgstr "Sie müssen einen Ziel-Eingabe-Indexwert und ein Ziel angeben"
 
 #: src/utils/pactl.c:2854
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a source"
 msgstr ""
 "Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Sie müssen einen Modulnamen angeben und Argumente übergeben."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Sie müssen einen Indexwert für ein Modul oder einen Namen angeben"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2869
 msgid "You have to specify a module name and arguments."
 msgstr "Sie müssen einen Modulnamen angeben und Argumente übergeben."
@@ -3107,17 +3851,26 @@ msgid "You have to specify a module index or name"
 msgstr "Sie müssen einen Indexwert für ein Modul oder einen Namen angeben"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Sie dürfen nicht mehrere Ziele angeben. Sie müssen zumindest eine boolesche "
 "Variable übergeben."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Ungültige Aussetzungs-Angaben."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Ungültige Aussetzungs-Angaben."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3125,6 +3878,29 @@ msgstr ""
 "Sie dürfen nicht mehrere Quellen angeben. Sie müssen zumindest eine "
 "boolesche Variable übergeben."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Sie müssen einen Karten-Namen/Indexwert und einen Profilnamen angeben."
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Sie müssen einen Ziel-Namen/-Indexwert und einen Portnamen angeben."
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Sie müssen einen Ziel-Namen angeben."
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben."
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Sie müssen einen Quellennamen angeben."
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Sie müssen einen Karten-Namen/Indexwert und einen Profilnamen angeben."
@@ -3146,10 +3922,35 @@ msgid "You have to specify a source name"
 msgstr "Sie müssen einen Quellennamen angeben."
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Sie müssen einen Ziel-Namen angeben."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Sie müssen einen Ziel-Namen/-Indexwert und eine Lautstärke angeben."
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Sie müssen einen Quellennamen angeben."
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Sie müssen einen Ziel-Eingabe-Indexwert und eine Lautstärke angeben."
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Ungültiger Ziel-Eingabe-Index"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Sie müssen einen Ziel-Namen/-Indexwert und eine Lautstärke angeben."
@@ -3172,45 +3973,75 @@ msgid "Invalid sink input index"
 msgstr "Ungültiger Ziel-Eingabe-Index"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a volume"
 msgstr ""
 "Sie müssen eine Indexwert für die Quell-Ausgabe und eine Lautstärke angeben."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Ungültiger Quellen-Ausgabe-Index"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3065
 msgid "Invalid source output index"
 msgstr "Ungültiger Quellen-Ausgabe-Index"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Sie müssen einen Ziel-Namen/-Indexwert und eine Aktion für die "
 "Stummschaltung angeben (0, 1, oder »toggle«)."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Ungültige Angaben zur Stummschaltung"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Ungültige Angaben zur Stummschaltung"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Sie müssen einen Quellennamen/-Indexwert und eine Aktion für die "
 "Stummschaltung angeben (0, 1, oder »toggle«)."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Sie müssen einen Ziel-Eingabe-Index und eine Aktion für die Stummschaltung "
 "angeben (0, 1, oder »toggle«)."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Ungültige Ziel-Eingabe-Index-Angaben"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Ungültige Ziel-Eingabe-Index-Angaben"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3218,22 +4049,38 @@ msgstr ""
 "Sie müssen einen Quellen-Ausgabe-Index und eine Aktion für die "
 "Stummschaltung angeben (0, 1, oder »toggle«)."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Ungültige Quellen-Ausgabe-Index-Angaben"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Ungültige Quellen-Ausgabe-Index-Angaben"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Sie müssen einen Ziel-Namen/-Indexwert und einen Portnamen angeben."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3241,17 +4088,29 @@ msgstr ""
 "Sie müssen einen Ziel-Indexwert und eine durch Kommata getrennte Liste der "
 "unterstützten Formate angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Sie müssen einen Karten-Namen/Indexwert, einen Portnamen und einen "
 "Latenzversatz angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Latenzversatz konnte nicht ausgewertet werden"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Latenzversatz konnte nicht ausgewertet werden"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Kein gültiger Befehl angegeben."
 
diff --git a/po/de_CH.po b/po/de_CH.po
index bd89109d8..ec518a13a 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -10,7 +10,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:53+0000\n"
 "Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
 "Language-Team: German <fedora-trans-de@redhat.com>\n"
@@ -167,10 +171,16 @@ msgid "--fail expects boolean argument"
 msgstr "Option --fail erfordert bool'schen Wert"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level erfordert Wert für Grad der Protokollierung (entweder numerisch "
 "im Bereich 0..4 or einen dieser: debug, info, notice, warn, error)."
@@ -583,7 +593,11 @@ msgid "Line In"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr ""
 
@@ -607,12 +621,20 @@ msgid "Internal Microphone"
 msgstr "Internes Audio"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr ""
 
@@ -649,12 +671,20 @@ msgid "No Bass Boost"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphones"
 msgstr "Analog Mono"
@@ -779,7 +809,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -905,7 +939,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Aus"
 
@@ -919,7 +957,11 @@ msgstr "Ausgang %s"
 msgid "%s Input"
 msgstr "Eingang %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -930,7 +972,11 @@ msgid ""
 "returned 0 or another value < min_avail."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1023,6 +1069,16 @@ msgstr[1] ""
 "Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
 "diesen Punkt den ALSA-Entwicklern."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1031,19 +1087,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "Ausgang %s"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "Analog Mono"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1061,15 +1145,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High Fidelity-Wiedergabe (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "High Fidelity-Aufnahme (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1083,6 +1187,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1130,8 +1235,13 @@ msgid ""
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1162,12 +1272,20 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+=======
 #: src/modules/module-null-sink.c:356
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Null Output"
 msgstr "Ausgang %s"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
@@ -1191,14 +1309,24 @@ msgstr ""
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1224,7 +1352,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Unbekannter Fehlercode"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1435,7 +1567,10 @@ msgstr "Oben Hinten Rechts"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(ungültig)"
 
@@ -1486,6 +1621,73 @@ msgstr "waitpid(): %s"
 #, c-format
 msgid "Received message for unknown extension '%s'"
 msgstr "Nachricht für unbekannte Erweiterung '%s' erhalten"
+<<<<<<< HEAD
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "Eingang %s"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "Ausgang %s"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(ungültig)"
+
+#: src/pulsecore/core-util.c:1790
+#, 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 ""
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr ""
+
+#: src/pulsecore/core-util.h:97
+#, fuzzy
+msgid "no"
+msgstr "Mono"
+
+#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "Fehler beim Zugriff auf Autostart -Sperre."
+
+#: src/pulsecore/log.c:165
+#, fuzzy, c-format
+msgid "Failed to open target file '%s'."
+msgstr "Öffnen der Datei '%s' fehlgeschlagen\n"
+
+#: src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: src/pulsecore/log.c:651
+#, fuzzy
+msgid "Invalid log target."
+msgstr "[%s:%u] Ungültiges Log-Ziel '%s'."
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Internes Audio"
+
+#: src/pulsecore/sink.c:3544
+msgid "Modem"
+msgstr "Modem"
+
+=======
 
 #: src/pulse/direction.c:37
 #, fuzzy
@@ -1551,6 +1753,7 @@ msgstr "Internes Audio"
 msgid "Modem"
 msgstr "Modem"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/error.c:38
 msgid "OK"
 msgstr "OK"
@@ -1823,7 +2026,11 @@ msgstr "Entleeren des Streams fehlgeschlagen: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Verbindungsfehler: %s"
@@ -2001,7 +2208,11 @@ msgstr ""
 "Kompiliert mit libpulse %s\n"
 "Gelinkt mit libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Ungültiger Client-Name '%s'"
@@ -2072,7 +2283,11 @@ msgid ""
 "specification from file."
 msgstr "Warnung: Beziehen der Sample-Angabe aus Datei fehlgeschlagen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Beziehen der Sample-Informationen der Datei fehlgeschlagen."
 
@@ -2108,7 +2323,11 @@ msgstr "abspielen"
 msgid "Failed to set media name."
 msgstr "Parsen der Kommandzeile fehlgeschlagen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() fehlgeschlagen"
 
@@ -2116,11 +2335,19 @@ msgstr "pa_mainloop_new() fehlgeschlagen"
 msgid "io_new() failed."
 msgstr "io_new() fehlgeschlagen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() fehlgeschlagen."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() fehlgeschlagen."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_new() fehlgeschlagen: %s"
@@ -2129,6 +2356,23 @@ msgstr "pa_context_new() fehlgeschlagen: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_new() fehlgeschlagen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() fehlgeschlagen."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() fehlgeschlagen."
@@ -2144,6 +2388,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2155,7 +2400,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2191,7 +2440,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2199,6 +2452,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2208,6 +2472,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2223,7 +2488,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2266,6 +2535,7 @@ msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 #, c-format
 msgid "connect(): %s"
 msgstr "connect(): %s"
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
@@ -2275,6 +2545,17 @@ msgstr "Terminieren des PulseAudio-Daemon fehlgeschlagen."
 msgid "Daemon not responding."
 msgstr "Daemon antwortet nicht."
 
+=======
+
+#: src/utils/pacmd.c:173
+msgid "Failed to kill PulseAudio daemon."
+msgstr "Terminieren des PulseAudio-Daemon fehlgeschlagen."
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "Daemon antwortet nicht."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
@@ -2290,17 +2571,37 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Beziehen der Statistik fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Momentane Nutzung: %u Blöcke mit insgesamt %s Bytes.\n"
 msgstr[1] "Momentane Nutzung: %u Blöcke mit insgesamt %s Bytes.\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
+msgstr[1] "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
+
+#: src/utils/pactl.c:193
+=======
 
 #: src/utils/pactl.c:205
 #, fuzzy, c-format
@@ -2311,21 +2612,34 @@ msgstr[0] "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
 msgstr[1] "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Sample-Pufferspeichergrösse: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Beziehen der Server-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2336,7 +2650,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2359,6 +2677,21 @@ msgstr ""
 "-Standard-Quelle: %s\n"
 "Cookie: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2372,10 +2705,58 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "Unbekannter Befehl"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
@@ -2421,17 +2802,27 @@ msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Analog Mono"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Erhalten der Sink-Informationen fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2470,37 +2861,66 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tProfile:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktive Profile: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tProfile:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2539,6 +2959,17 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "k. A."
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2548,11 +2979,16 @@ msgid "n/a"
 msgstr "k. A."
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Beziehen der Modul-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2569,12 +3005,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Beziehen der Client-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2589,12 +3033,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Beziehen der Karten-Information fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2611,45 +3063,77 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfile:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktive Profile: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Konnte Sink-Eingabe-Informationen nicht holen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2687,12 +3171,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Konnte Informationen über Quell-Ausgabe nicht holen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2730,12 +3222,20 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Beziehen der Sample-Informationen fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2765,21 +3265,44 @@ msgstr ""
 "\tEigenschaften:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2789,16 +3312,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Hochladen des Sample fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2809,11 +3341,50 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Hochladen des Sample fehlgeschlagen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Dateiende ist zu früh aufgetreten"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "Sink"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "Quelle"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Dateiende ist zu früh aufgetreten"
@@ -2847,10 +3418,26 @@ msgid "sink-input"
 msgstr ""
 
 #: src/utils/pactl.c:2170
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "source-output"
 msgstr "Quelle"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2173
 msgid "module"
 msgstr ""
@@ -2864,19 +3451,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "Ungültiger Server"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT empfangen, beenden."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Ungültige Sample-Angaben"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT empfangen, beenden."
@@ -2890,15 +3501,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "Ungültige Sample-Angaben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "Ungültige Sample-Angaben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2944,6 +3607,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2951,7 +3615,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2972,7 +3640,11 @@ msgstr ""
 "  -s, --server=SERVER                   Name des Zielservers\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2983,16 +3655,47 @@ msgstr ""
 "Kompiliert mit libpulse %s\n"
 "Gelinkt mit libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Ungültiger Stream-Name '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Geben Sie eine zu öffnende Sample-Datei an"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Öffnen der Audio-Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Warnung: Beziehen der Sample-Angabe aus Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Sie müssen eine zu löschende Sample-Datei angeben"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Sie müssen einen Sink-Eingabe-Indexwert und einen Sink angeben"
+
+#: src/utils/pactl.c:2042
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Geben Sie eine zu öffnende Sample-Datei an"
@@ -3018,32 +3721,53 @@ msgid "You have to specify a sink input index and a sink"
 msgstr "Sie müssen einen Sink-Eingabe-Indexwert und einen Sink angeben"
 
 #: src/utils/pactl.c:2854
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a source"
 msgstr ""
 "Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Sie müssen einen Modulnamen angeben und Argumente übergeben."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2869
 msgid "You have to specify a module name and arguments."
 msgstr "Sie müssen einen Modulnamen angeben und Argumente übergeben."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "Sie müssen einen Indexwert für ein Modul angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Sie sollten nur eine Senke angeben. Sie müssen zumindest einen bool'schen "
 "Wert übergeben."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "Ungültige Sample-Angaben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3051,6 +3775,17 @@ msgstr ""
 "Sie sollten nur eine Quelle angeben. Sie müssen zumindest einen bool'schen "
 "Wert übergeben."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Sie müssen einen Karten-Name/Indexwert und einen Profilnamen angeben"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Sie müssen einen Senkennamen/-Indexwert und einen Portnamen angeben"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Sie müssen einen Karten-Name/Indexwert und einen Profilnamen angeben"
@@ -3060,33 +3795,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "Sie müssen einen Senkennamen/-Indexwert und einen Portnamen angeben"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "Sie müssen einen Indexwert für ein Modul angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Sie müssen einen Senkennamen/-Indexwert und einen Portnamen angeben"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Sie müssen einen Senkennamen/-Indexwert und einen Portnamen angeben"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Sie müssen einen Indexwert für ein Modul angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Sie müssen einen Sink-Eingabe-Indexwert und einen Sink angeben"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Ungültiger Sink-Eingabe-Index"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
@@ -3100,84 +3871,142 @@ msgid "Invalid sink input index"
 msgstr "Ungültiger Sink-Eingabe-Index"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr ""
 "Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "Ungültiger Sink-Eingabe-Index"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Sie müssen einen Senkennamen/-Indexwert und einen Portnamen angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "Ungültige Sample-Angaben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "Sie müssen einen Sink-Eingabe-Indexwert und einen Sink angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Ungültige Sink-Eingabe-Index-Angaben"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Ungültige Sink-Eingabe-Index-Angaben"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "Ungültige Sink-Eingabe-Index-Angaben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Sie müssen einen Senkennamen/-Indexwert und einen Portnamen angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "Sie müssen einen Senkennamen/-Indexwert und einen Portnamen angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Sie müssen einen Karten-Name/Indexwert und einen Profilnamen angeben"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Kein gültiger Befehl angegeben."
 
diff --git a/po/el.po b/po/el.po
index 18538962c..892b58426 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2014-05-08 09:53+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
 "Language-Team: team@lists.gnome.gr\n"
@@ -181,7 +185,10 @@ msgid "--fail expects boolean argument"
 msgstr "Το --fail περιμένει όρισμα τιμής Μπουλ"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+=======
 #, fuzzy
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
@@ -621,7 +628,11 @@ msgid "Line In"
 msgstr "Γραμμή εισόδου"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Μικρόφωνο"
 
@@ -642,12 +653,20 @@ msgid "Internal Microphone"
 msgstr "Εσωτερικό μικρόφωνο"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Ραδιόφωνο"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Βίντεο"
 
@@ -684,12 +703,20 @@ msgid "No Bass Boost"
 msgstr "Χωρίς ενίσχυση μπάσων"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Ηχείο"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Ακουστικά"
 
@@ -752,6 +779,7 @@ msgstr "Αναλογική 4κάναλη είσοδος"
 #, fuzzy
 msgid "Multichannel Output"
 msgstr "Μηδενική έξοδος"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:2818
 #, fuzzy
@@ -773,6 +801,29 @@ msgstr "Είσοδος %s"
 msgid "Virtual Surround 7.1"
 msgstr "Εικονικός περιφερειακός ήχος δέκτη"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:2818
+#, fuzzy
+msgid "Game Output"
+msgstr "Έξοδος %s"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "Έξοδος %s"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "Είσοδος %s"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Εικονικός περιφερειακός ήχος δέκτη"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Αναλογικό μονοφωνικό"
@@ -807,7 +858,11 @@ msgid "Stereo"
 msgstr "Στερεοφωνικό"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Ακουστικά"
 
@@ -922,7 +977,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Ανενεργό"
 
@@ -936,7 +995,11 @@ msgstr "Έξοδος %s"
 msgid "%s Input"
 msgstr "Είσοδος %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -953,7 +1016,11 @@ msgstr ""
 "Ενεργοποίηση με ορισμό POLLOUT -- όμως η επόμενη snd_pcm_avail() επέστρεψε 0 "
 "ή άλλη τιμή < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1052,6 +1119,64 @@ msgstr[1] ""
 "Το πιθανότερο αυτό είναι ένα σφάλμα στον οδηγό ALSA '%s'. Παρακαλούμε, "
 "αναφέρτε αυτό το θέμα στους προγραμματιστές ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Είσοδος μπλουτούθ"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Έξοδος μπλουτούθ"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Ανοιχτής ακρόασης"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Ακουστικό"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Φορητό"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Αυτοκίνητο"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Υψηλή πιστότητα"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Αναπαραγωγή υψηλής ποιότητας (δέκτης A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Λήψη υψηλής ποιότητας (πηγή A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1108,6 +1233,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1173,8 +1299,13 @@ msgstr ""
 "autoloaded=<πρίστε αν αυτή η ενότητα θα φορτώνεται αυτόματα> "
 "use_volume_sharing=<ναι ή όχι> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1213,11 +1344,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Δέκτης NULL με χρονιστή"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Μηδενική έξοδος"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Μηδενική έξοδος"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Αποτυχία ορισμού μορφής: άκυρη συμβολοσειρά μορφής %s"
@@ -1240,14 +1379,24 @@ msgstr "Ήχος στο @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Διόδευση για %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Διόδευση για %s/%s"
@@ -1278,7 +1427,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Άγνωστος κωδικός σφάλματος"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1489,7 +1642,10 @@ msgstr "Πάνω πίσω δεξιά"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(άκυρο)"
 
@@ -1597,11 +1753,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Άκυρος προορισμός καταγραφής."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Εσωτερικός ήχος"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Εσωτερικός ήχος"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Μόντεμ"
 
@@ -1880,7 +2044,11 @@ msgstr "Αποτυχία ορισμού ροής οθόνης: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Αποτυχία pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Αποτυχία σύνδεσης: %s"
@@ -2083,7 +2251,11 @@ msgstr ""
 "Μεταγλωττισμένο με libpulse %s\n"
 "Συνδεμένο με libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Άκυρο όνομα πελάτη '%s'"
@@ -2156,7 +2328,11 @@ msgstr ""
 "Προειδοποίηση: η συγκεκριμένη προδιαγραφή δείγματος θα αντικατασταθεί με την "
 "προδιαγραφή από το αρχείο."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Αποτυχία προσδιορισμού προδιαγραφής δείγματος από το αρχείο."
 
@@ -2191,7 +2367,11 @@ msgstr "Αναπαραγωγή"
 msgid "Failed to set media name."
 msgstr "Αποτυχία ορισμού ονόματος μέσων."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Αποτυχία pa_mainloop_new()."
 
@@ -2199,11 +2379,19 @@ msgstr "Αποτυχία pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Αποτυχία io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Αποτυχία pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Αποτυχία pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Αποτυχία pa_context_connect(): %s"
@@ -2212,6 +2400,23 @@ msgstr "Αποτυχία pa_context_connect(): %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Αποτυχία pa_context_rttime_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Αποτυχία pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "ΟΝΟΜΑ [ΟΡΙΣΜΑΤΑ ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "ΟΝΟΜΑ|#Ν"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Αποτυχία pa_mainloop_run()."
@@ -2227,6 +2432,7 @@ msgstr "ΟΝΟΜΑ|#Ν"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "ΟΝΟΜΑ"
 
@@ -2238,7 +2444,11 @@ msgstr "ΟΝΟΜΑ| ΕΝΤΑΣΗ #Ν"
 msgid "#N VOLUME"
 msgstr "#Ν ΕΝΤΑΣΗ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "ΟΝΟΜΑ|#Ν 1|0"
 
@@ -2274,7 +2484,11 @@ msgstr "ΟΝΟΜΑ ΔΙΑΔΡΟΜΗΣ"
 msgid "FILENAME SINK|#N"
 msgstr "ΟΝΟΜΑ ΑΡΧΕΙΟΥ ΔΕΚΤΗ|#Ν"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#Ν ΔΕΚΤΗΣ|ΠΗΓΗ"
 
@@ -2282,6 +2496,17 @@ msgstr "#Ν ΔΕΚΤΗΣ|ΠΗΓΗ"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "ΚΑΤΑΤΟΜΗ ΚΑΡΤΑΣ"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "ΟΝΟΜΑ|ΘΥΡΑ #Ν"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "ΚΑΤΑΤΟΜΗ ΚΑΡΤΑΣ"
@@ -2291,6 +2516,7 @@ msgid "NAME|#N PORT"
 msgstr "ΟΝΟΜΑ|ΘΥΡΑ #Ν"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "ΟΝΟΜΑ ΚΑΡΤΑΣ|ΚΑΡΤΑ-#Ν ΑΝΤΙΣΤΑΘΜΙΣΗ ΘΥΡΑΣ"
 
@@ -2307,7 +2533,11 @@ msgstr "ΑΡΙΘΜΗΤΙΚΟ ΕΠΙΠΕΔΟ"
 msgid "FRAMES"
 msgstr "ΠΛΑΙΣΙΑ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2373,12 +2603,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Αποτυχία λήψης στατιστικών: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2387,7 +2625,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Χρησιμοποιούνται τώρα: %u ομάδες που περιέχουν συνολικά %s ψηφιολέξεις.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2399,22 +2641,38 @@ msgstr[1] ""
 "Κατανεμημένα κατά τη διάρκεια του συνολικού χρόνου ζωής: %u ομάδες που "
 "περιέχουν συνολικά %s ψηφιολέξεις.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "μέγεθος κρυφής μνήμης δείγματος: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών διακομιστή: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2431,7 +2689,11 @@ msgstr ""
 "Δείκτης πελάτη: %u\n"
 "Μέγεθος παράθεσης: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2454,6 +2716,21 @@ msgstr ""
 "Προεπιλεγμένη πηγή: %s\n"
 "Μπισκότο: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2467,28 +2744,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "άγνωστο"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Γραμμή εισόδου"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Ακουστικά"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2510,26 +2827,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Είσοδος μπλουτούθ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Αναλογικό μονοφωνικό"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών δέκτη: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2568,37 +2903,66 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tΘύρες:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tΕνεργή θύρα: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tΜορφές:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών πηγής: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2637,6 +3001,17 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "μη διαθέσιμο"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2646,11 +3021,16 @@ msgid "n/a"
 msgstr "μη διαθέσιμο"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών ενότητας: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2667,12 +3047,20 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών πελάτη: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2687,12 +3075,20 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών κάρτας: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2709,28 +3105,48 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tΚατατομές:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tΕνεργή κατατομή: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2739,17 +3155,29 @@ msgstr ""
 "\t\t\tΙδιότητες:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tΤμήμα των κατατομών: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών εισόδου δέκτη: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2788,12 +3216,20 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών εξόδου πηγής: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2832,12 +3268,20 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Αποτυχία λήψης πληροφοριών δείγματος: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2866,21 +3310,44 @@ msgstr ""
 "\tΙδιότητες:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Αποτυχία: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "Αποτυχία read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2890,16 +3357,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Αποτυχία εκφόρτωσης ενότητας: η ενότητα %s δεν φορτώθηκε"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2914,11 +3390,74 @@ msgstr[1] ""
 "Αποτυχία ορισμού έντασης: Προσπαθήσατε να ορίσετε εντάσεις για %d κανάλια, "
 "ενώ τα υποστηριζόμενα κανάλια είναι %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Αποτυχία αποστολής δείγματος: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Πρόωρο τέλος του αρχείου"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "νέο"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "αλλαγή"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "αφαίρεση"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "άγνωστο"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "δέκτης"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "πηγή"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "είσοδος δέκτη"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "έξοδος πηγής"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "ενότητα"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "πελάτης"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "κρυφή μνήμη δείγματος"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "διακομιστής"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "κάρτα"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Πρόωρο τέλος του αρχείου"
@@ -2976,10 +3515,78 @@ msgid "card"
 msgstr "κάρτα"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Συμβάν '%s' στο %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Ελήφθη SIGINT, έξοδος."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Άκυρη προδιαγραφή έντασης"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Η ένταση εκτός επιτρεπτής περιοχής.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Άκυρος αριθμός προδιαγραφών έντασης.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Ασύμβατη προδιαγραφή έντασης.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[επιλογές]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[ΤΥΠΟΣ]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "ΟΝΟΜΑΑΡΧΕΙΟΥ [ΟΝΟΜΑ]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "ΟΝΟΜΑ [ΔΕΚΤΗΣ]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "ΟΝΟΜΑ| ΕΝΤΑΣΗ #Ν [ΕΝΤΑΣΗ ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N ΕΝΤΑΣΗ [ΕΝΤΑΣΗ ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "ΟΝΟΜΑ|#Ν 1|0|εναλλαγή"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#Ν 1|0|εναλλαγή"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "ΜΟΡΦΕΣ #Ν"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Ελήφθη SIGINT, έξοδος."
@@ -3045,6 +3652,7 @@ msgid "#N FORMATS"
 msgstr "ΜΟΡΦΕΣ #Ν"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3056,8 +3664,13 @@ msgstr ""
 "μπορούν να χρησιμοποιηθούν ορίζοντας τον προεπιλεγμένο δέκτη, πηγή και "
 "οθόνη.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3078,7 +3691,11 @@ msgstr ""
 "  -n, --client-name=NAME                Πώς να κληθεί αυτός ο πελάτης στον "
 "διακομιστή\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3089,16 +3706,31 @@ msgstr ""
 "Μεταγλωττισμένο με libpulse %s\n"
 "Συνδεμένο με libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Άκυρο όνομα ροής '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Ορίστε τίποτα, ή ένα από τα: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Παρακαλούμε ορίστε ένα αρχείο δείγματος για φόρτωση"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Αποτυχία ανοίγματος αρχείου ήχου."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Παρακαλούμε ορίστε ένα αρχείο δείγματος για φόρτωση"
@@ -3108,10 +3740,38 @@ msgid "Failed to open sound file."
 msgstr "Αποτυχία ανοίγματος αρχείου ήχου."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Προειδοποίηση: Αποτυχία προσδιορισμού προδιαγραφής δείγματος από αρχείο."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Πρέπει να ορίσετε ένα όνομα δείγματος για αναπαραγωγή"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Πρέπει να ορίσετε ένα όνομα δείγματος για αφαίρεση"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εισόδου δέκτη και έναν δέκτη"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εξόδου πηγής και μια πηγή"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Πρέπει να ορίσετε ένα όνομα ενότητας και ορίσματα."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Πρέπει να ορίσετε έναν δείκτη ενότητας ή όνομα"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Πρέπει να ορίσετε ένα όνομα δείγματος για αναπαραγωγή"
@@ -3137,17 +3797,26 @@ msgid "You have to specify a module index or name"
 msgstr "Πρέπει να ορίσετε έναν δείκτη ενότητας ή όνομα"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Δεν μπορείτε να ορίσετε περισσότερους από έναν δέκτη. Πρέπει να ορίσετε μια "
 "τιμή Μπουλ."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Άκυρη προδιαγραφή αναστολής."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Άκυρη προδιαγραφή αναστολής."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3155,6 +3824,29 @@ msgstr ""
 "Δεν μπορείτε να ορίσετε περισσότερες από μία πηγές. Πρέπει να ορίσετε μια "
 "τιμή Μπουλ."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη κάρτας και ένα όνομα κατατομής"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη δέκτη και ένα όνομα θύρας"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Πρέπει να ορίσετε ένα όνομα δέκτη"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη πηγής και ένα όνομα θύρας"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Πρέπει να ορίσετε ένα όνομα πηγής"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη κάρτας και ένα όνομα κατατομής"
@@ -3176,19 +3868,51 @@ msgid "You have to specify a source name"
 msgstr "Πρέπει να ορίσετε ένα όνομα πηγής"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Πρέπει να ορίσετε ένα όνομα δέκτη"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη δέκτη και μια ένταση"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη δέκτη και μια ένταση"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Πρέπει να ορίσετε ένα όνομα πηγής"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη πηγής και μια ένταση"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εισόδου δέκτη και μια ένταση"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Άκυρος δείκτης εισόδου δέκτη"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εξόδου πηγής και μια ένταση"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Άκυρος δείκτης εξόδου πηγής"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη πηγής και μια ένταση"
@@ -3210,55 +3934,93 @@ msgid "Invalid source output index"
 msgstr "Άκυρος δείκτης εξόδου πηγής"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Πρέπει να ορίσετε έναν δείκτη/όνομα δέκτη και μια τιμή Μπουλ σίγασης"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Άκυρη προδιαγραφή σίγασης"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Άκυρη προδιαγραφή σίγασης"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη πηγής και μια τιμή Μπουλ σίγασης"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "Πρέπει να ορίσετε έναν δείκτη εισόδου δέκτη και μια τιμή Μπουλ σίγασης"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Άκυρη προδιαγραφή δείκτη εισόδου δέκτη"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Άκυρη προδιαγραφή δείκτη εισόδου δέκτη"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "Πρέπει να ορίσετε έναν δείκτη εξόδου πηγής και μια τιμή Μπουλ σίγασης"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Άκυρη προδιαγραφή δείκτη εξόδου πηγής"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Άκυρη προδιαγραφή δείκτη εξόδου πηγής"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη δέκτη και ένα όνομα θύρας"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3266,17 +4028,29 @@ msgstr ""
 "Πρέπει να ορίσετε έναν δείκτη δέκτη και έναν κατάλογο χωριζόμενο με ; των "
 "υποστηριζόμενων μορφών"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Πρέπει να ορίσετε ένα όνομα/δείκτη κάρτας, ένα όνομα θύρας και μια "
 "μετατόπιση λανθάνοντος χρόνου"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Αδύνατη η ανάλυση μετατόπισης λανθάνοντος χρόνου"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Αδύνατη η ανάλυση μετατόπισης λανθάνοντος χρόνου"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Δεν ορίστηκε έγκυρη εντολή."
 
diff --git a/po/eo.po b/po/eo.po
index 0e35e26c8..1f8ff9c09 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2021-02-05 01:40+0000\n"
 "Last-Translator: Carmen Bianca Bakker <carmen@carmenbianca.eu>\n"
 "Language-Team: Esperanto <https://translate.fedoraproject.org/projects/"
@@ -103,7 +107,11 @@ msgstr ""
 #: src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
+<<<<<<< HEAD
+"of debug, info, notice, warn, error)."
+=======
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 
 #: src/daemon/cmdline.c:277
@@ -498,7 +506,11 @@ msgid "Line In"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofono"
 
@@ -519,12 +531,20 @@ msgid "Internal Microphone"
 msgstr "Interna mikrofono"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -561,12 +581,20 @@ msgid "No Bass Boost"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Laŭtparolilo"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Kapaŭskultilo"
 
@@ -674,7 +702,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Kaptelefono"
 
@@ -787,7 +819,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Mono-babilo + 7.1 ĉirkaŭa sono"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Malŝaltita"
 
@@ -801,7 +837,11 @@ msgstr "%s-eligo"
 msgid "%s Input"
 msgstr "%s-enigo"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -812,7 +852,11 @@ msgid ""
 "returned 0 or another value < min_avail."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -877,6 +921,52 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bludenta enigo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bludenta eligo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Libermana"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Kapaŭskultilo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Aŭto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefono"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Altfidela ludado (A2DP-celo)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Altfidela kaptado (A2DP-fonto)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -921,21 +1011,34 @@ msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Altfidela kaptado (A2DP-fonto)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2066
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Head Unit (HSP)"
 msgstr "Kaptelefona unuo (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2079
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Audio Gateway (HSP)"
 msgstr "Kaptelefona sonkluzo (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2092
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Head Unit (HFP)"
 msgstr "Kaptelefona unuo (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Kaptelefona sonkluzo (HSP/HFP)"
@@ -984,8 +1087,13 @@ msgid ""
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1015,11 +1123,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr ""
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr ""
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
@@ -1042,14 +1158,24 @@ msgstr "Sono sur @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunelo por %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunelo al %s/%s"
@@ -1073,7 +1199,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1284,7 +1414,10 @@ msgstr "Supra-malantaŭ-dekstro"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(nevalida)"
 
@@ -1386,11 +1519,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Integrita sono"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Integrita sono"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr ""
 
@@ -1665,7 +1806,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr ""
@@ -1720,9 +1865,13 @@ msgid ""
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -d, --device=DEVICE                   The name of the sink/source to "
+<<<<<<< HEAD
+"connect to\n"
+=======
 "connect to. The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and "
 "@DEFAULT_MONITOR@ can be used to specify the default sink, source and "
 "monitor respectively.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 "      --stream-name=NAME                How to call this stream on the "
@@ -1801,7 +1950,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1872,7 +2025,11 @@ msgid ""
 "specification from file."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1906,7 +2063,11 @@ msgstr "ludado"
 msgid "Failed to set media name."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1914,11 +2075,19 @@ msgstr ""
 msgid "io_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr ""
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr ""
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1927,6 +2096,23 @@ msgstr ""
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr ""
@@ -1942,6 +2128,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -1953,7 +2140,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -1989,7 +2180,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -1997,6 +2192,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2006,6 +2212,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2021,7 +2228,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2079,19 +2290,31 @@ msgstr ""
 msgid "read(): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2099,22 +2322,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2125,7 +2364,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2139,6 +2382,74 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "disponebla"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "nedisponebla"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Nekonata"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mikrofono"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bludento"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Reto"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analoga"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2205,11 +2516,16 @@ msgstr "Analoga"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2231,37 +2547,66 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2283,6 +2628,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr ""
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2292,11 +2648,16 @@ msgid "n/a"
 msgstr ""
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2307,12 +2668,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2322,12 +2691,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2338,45 +2715,77 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2398,12 +2807,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2425,12 +2842,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2447,21 +2872,44 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2471,16 +2919,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2491,11 +2948,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr ""
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr ""
@@ -2553,10 +3073,78 @@ msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr ""
@@ -2622,6 +3210,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2629,22 +3218,33 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -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 ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2652,16 +3252,59 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr ""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr ""
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr ""
@@ -2699,20 +3342,84 @@ msgid "You have to specify a module index or name"
 msgstr ""
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr ""
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr ""
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
@@ -2766,35 +3473,68 @@ msgid "Invalid source output index"
 msgstr ""
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr ""
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr ""
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr ""
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr ""
@@ -2804,17 +3544,33 @@ msgid "You have to specify at least an object path and a message name"
 msgstr ""
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -2824,6 +3580,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index a14124216..4bd3dc052 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,8 +13,13 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-06-28 15:04+0000\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-12-18 11:19+0000\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Last-Translator: Toni Estevez <toni.estevez@gmail.com>\n"
 "Language-Team: Spanish <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/es/>\n"
@@ -23,7 +28,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.7\n"
+=======
 "X-Generator: Weblate 4.15\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "X-Poedit-Language: Spanish\n"
 
 #: src/daemon/cmdline.c:113
@@ -99,6 +108,52 @@ msgid ""
 msgstr ""
 "%s [opciones]\n"
 "\n"
+<<<<<<< HEAD
+"COMANDOS:\n"
+"  -h, --help                            Muestra esta ayuda\n"
+"      --version                         Muestra la versión\n"
+"      --dump-conf                       Vuelca la configuración "
+"predeterminada\n"
+"      --dump-modules                    Lista los módulos disponibles\n"
+"      --dump-resample-methods           Lista los métodos de remuestreo\n"
+"      --cleanup-shm                     Limpia segmentos de memoria "
+"compartida\n"
+"      --start                           Inicia el demonio si no está ya en "
+"marcha\n"
+"  -k  --kill                            Mata un demonio en ejecución\n"
+"      --check                           Comprueba si hay un demonio en "
+"marcha\n"
+"                                        (sólo devuelve el código de "
+"retorno)\n"
+"\n"
+"OPCIONES:\n"
+"      --system[=BOOL]                   Se ejecuta como instancia de "
+"sistema\n"
+"  -D, --daemonize[=BOOL]                Pasa a demonio tras el inicio\n"
+"      --fail[=BOOL]                     Sale si el inicio falla\n"
+"      --high-priority[=BOOL]            Intenta usar prioridad alta\n"
+"                                        (sólo disponible como root, con SUID "
+"o\n"
+"                                        con RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 Intenta usar prioridad de tiempo "
+"real\n"
+"                                        (sólo disponible como root, con SUID "
+"o\n"
+"                                        con RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  No permite la carga/desactivación "
+"de\n"
+"                                        módulos por parte del usuario tras "
+"el\n"
+"                                        inicio\n"
+"      --disallow-exit[=BOOL]            No permite la salida a petición del\n"
+"                                        usuario\n"
+"      --exit-idle-time=SEGUNDOS         Finaliza el demonio tras ese tiempo\n"
+"                                        de inactividad\n"
+"      --scache-idle-time=SEGUNDOS       Descarga las muestras automáticas "
+"tras\n"
+"                                        ese tiempo de inactividad\n"
+"      --log-level[=NIVEL]               Aumenta o modifica el nivel de "
+=======
 "ÓRDENES:\n"
 "  -h, --help                            Mostrar esta ayuda\n"
 "      --version                         Mostrar la versión\n"
@@ -144,6 +199,7 @@ msgstr ""
 "                                        cuando esté inactivo y  haya pasado "
 "este tiempo\n"
 "      --log-level[=NIVEL]               Aumentar o configurar el nivel de "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "registro\n"
 "  -v  --verbose                         Aumentar el nivel de registro\n"
 "      --log-target={auto,syslog,stderr,file:RUTA,newfile:RUTA}\n"
@@ -158,6 +214,18 @@ msgstr ""
 "objetos\n"
 "                                        dinámicos compartidos (complementos)"
 "\n"
+<<<<<<< HEAD
+"SCRIPT DE INICIO:\n"
+"  -L, --load=\"MÓDULO PARÁMETROS\"        Carga el MÓDULO con los "
+"PARÁMETROS\n"
+"                                        indicados\n"
+"  -F, --file=ARCHIVO                    Ejecuta el script indicado\n"
+"  -C                                    Abre un intérprete de comandos tras\n"
+"                                        el inicio\n"
+"\n"
+"  -n                                    No carga el script de inicio\n"
+"                                        predeterminado\n"
+=======
 "      --resample-method=MÉTODO          Usar el método de remuestreo "
 "especificado\n"
 "                                        (Consulte los valores posibles con\n"
@@ -181,6 +249,7 @@ msgstr ""
 "                                        ejecución tras el inicio\n"
 "  -n                                    No cargar el archivo de órdenes "
 "predeterminado\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:246
 msgid "--daemonize expects boolean argument"
@@ -195,9 +264,15 @@ msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
 msgstr ""
+<<<<<<< HEAD
+"--log-level espera un argumento en el nivel del log (ya sea numérico, que "
+"caiga en el rango de 0..4; ya sea uno de debug, info, notice, warn, o "
+"error). "
+=======
 "--log-level espera un argumento para el nivel de registro (un valor numérico "
 "en el rango de 0-4 o bien uno de estos valores: error, warn, notice, info, "
 "debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:277
 msgid "--high-priority expects boolean argument"
@@ -224,8 +299,13 @@ msgid ""
 "Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
 "valid file name 'file:<path>', 'newfile:<path>'."
 msgstr ""
+<<<<<<< HEAD
+"El objetivo del registro no es válido; use «syslog», «journal», «stderr», "
+"«auto» o un nombre de archivo válido con «file:<ruta>» o «newfile:<ruta>»."
+=======
 "El destino del registro no es válido; use 'syslog', 'journal', 'stderr', "
 "'auto' o un nombre de archivo válido con 'file:<ruta>' o 'newfile:<ruta>'."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:330
 msgid ""
@@ -496,12 +576,20 @@ msgstr ""
 
 #: src/daemon/main.c:878
 msgid "Running in system mode, but --disallow-exit not set."
+<<<<<<< HEAD
+msgstr "Se ejecuta en modo sistema, pero no se ha especificado--disallow-exit."
+=======
 msgstr "Se ejecuta en modo sistema, pero no se ha configurado --disallow-exit."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:881
 msgid "Running in system mode, but --disallow-module-loading not set."
 msgstr ""
+<<<<<<< HEAD
+"Se ejecuta en modo sistema, pero no se ha especificado --disallow-module-"
+=======
 "Se ejecuta en modo sistema, pero no se ha configurado --disallow-module-"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "loading."
 
 #: src/daemon/main.c:884
@@ -616,7 +704,11 @@ msgid "Line In"
 msgstr "Entrada de línea"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Micrófono"
 
@@ -637,12 +729,20 @@ msgid "Internal Microphone"
 msgstr "Micrófono interno"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Vídeo"
 
@@ -679,12 +779,20 @@ msgid "No Bass Boost"
 msgstr "Sin refuerzo de graves"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Altavoz"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Auriculares"
 
@@ -710,7 +818,11 @@ msgstr "Auriculares 2"
 
 #: src/modules/alsa/alsa-mixer.c:2809
 msgid "Headphones Mono Output"
+<<<<<<< HEAD
+msgstr "Salida mono de los auriculares"
+=======
 msgstr "Salida mono de auriculares"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2810
 msgid "Line Out"
@@ -746,6 +858,21 @@ msgstr "Salida multicanal"
 
 #: src/modules/alsa/alsa-mixer.c:2818
 msgid "Game Output"
+<<<<<<< HEAD
+msgstr "Salida del juego"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+msgid "Chat Output"
+msgstr "Salida del chat"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+msgstr "Entrada del chat"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+msgid "Virtual Surround 7.1"
+msgstr "Sonido envolvente virtual 7.1"
+=======
 msgstr "Salida de juego"
 
 #: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
@@ -759,6 +886,7 @@ msgstr "Entrada de chat"
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "Envolvente virtual 7.1"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
@@ -792,7 +920,11 @@ msgid "Stereo"
 msgstr "Estéreo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Auriculares"
 
@@ -904,8 +1036,25 @@ msgstr "Dúplex estéreo"
 msgid "Mono Chat + 7.1 Surround"
 msgstr "Chat mono + envolvente 7.1"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr "Dúplex multicanal"
+
+#: src/modules/alsa/alsa-mixer.c:4738
+msgid "Stereo Duplex"
+msgstr "Dúplex estéreo"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr "Chat mono + Sonido envolvente 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Apagado"
 
@@ -919,7 +1068,11 @@ msgstr "Salida %s"
 msgid "%s Input"
 msgstr "Entrada %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -929,6 +1082,16 @@ msgid ""
 "We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
 "returned 0 or another value < min_avail."
 msgstr ""
+<<<<<<< HEAD
+"ALSA ha enviado un aviso para escribir datos nuevos en el dispositivo, pero "
+"en realidad no había nada que escribir.\n"
+"Seguramente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA.\n"
+"Se ha definido el evento POLLOUT, sin embargo un snd_pcm_avail() posterior "
+"ha devuelto 0 u otro valor < min_avail."
+
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 "ALSA nos despertó para escribir nuevos datos al dispositivo, pero en "
 "realidad no había nada para escribir.\n"
 "Probablemente sea un error en el controlador ALSA '%s'. Por favor, reporte "
@@ -937,6 +1100,7 @@ msgstr ""
 "snd_pcm_avail() devolvió 0 u otro valor < min_avail."
 
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -946,12 +1110,21 @@ msgid ""
 "We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
 "returned 0 or another value < min_avail."
 msgstr ""
+<<<<<<< HEAD
+"ALSA ha enviado un aviso para leer datos nuevos en el dispositivo, pero en "
+"realidad no había nada que leer.\n"
+"Seguramente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA.\n"
+"Se ha definido el evento POLLIN sin embargo un snd_pcm_avail() posterior ha "
+"devuelto 0 u otro valor < min_avail."
+=======
 "ALSA nos despertó para leer nuevos datos desde el dispositivo, pero en "
 "realidad no hay nada para leer.\n"
 "Probablemente sea un error del controlador ALSA '%s'. Por favor, reporte "
 "este problema a los desarrolladores de ALSA.\n"
 "Nos despertaron con POLLIN activado, sin embargo, la llamada a "
 "snd_pcm_avail() devolvió 0 u otro valor < min_avail."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
 #, c-format
@@ -968,6 +1141,15 @@ msgid_plural ""
 msgstr[0] ""
 "snd_pcm_avail() ha devuelto un valor excepcionalmente grande: %lu byte (%lu "
 "ms).\n"
+<<<<<<< HEAD
+"Probablemente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA."
+msgstr[1] ""
+"snd_pcm_avail() ha devuelto un valor excepcionalmente grande: %lu byte (%lu "
+"ms).\n"
+"Probablemente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA."
+=======
 "Probablemente se trata de un error en el controlador ALSA «%s». Informe de "
 "este problema a los desarrolladores de ALSA."
 msgstr[1] ""
@@ -975,6 +1157,7 @@ msgstr[1] ""
 "ms).\n"
 "Probablemente se trata de un error en el controlador ALSA «%s». Informe de "
 "este problema a los desarrolladores de ALSA."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-util.c:1249
 #, c-format
@@ -989,6 +1172,17 @@ msgid_plural ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
+<<<<<<< HEAD
+"snd_pcm_delay() ha devuelto un valor excepcionalmente grande: %li byte (%s"
+"%lu ms).\n"
+"Probablemente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA."
+msgstr[1] ""
+"snd_pcm_delay() ha devuelto un valor excepcionalmente grande: %li byte (%s"
+"%lu ms).\n"
+"Probablemente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA."
+=======
 "snd_pcm_delay() ha devuelto un valor excepcionalmente grande: %li byte ("
 "%s%lu ms).\n"
 "Probablemente se trata de un error en el controlador ALSA «%s». Informe de "
@@ -998,6 +1192,7 @@ msgstr[1] ""
 "%s%lu ms).\n"
 "Probablemente se trata de un error en el controlador ALSA «%s». Informe de "
 "este problema a los desarrolladores de ALSA."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-util.c:1296
 #, c-format
@@ -1025,6 +1220,74 @@ msgid_plural ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
+<<<<<<< HEAD
+"snd_pcm_mmap_begin() ha devuelto un valor excepcionalmente grande: %lu byte "
+"(%lu ms).\n"
+"Probablemente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA."
+msgstr[1] ""
+"snd_pcm_mmap_begin() ha devuelto un valor excepcionalmente grande: %lu byte "
+"(%lu ms).\n"
+"Probablemente se trata de un error en el controlador ALSA «%s». Informe del "
+"problema a los desarrolladores de ALSA."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Entrada bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Salida bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Manos libres"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Auriculares"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portátil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Coche"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Alta fidelidad"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Teléfono"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reproducción de alta fidelidad (destino A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Captura de alta fidelidad (fuente A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Unidad de auriculares (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Puerta de enlace de audio para auriculares (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Unidad de manos libres (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 "snd_pcm_mmap_begin() ha devuelto un valor excepcionalmente grande: %lu byte ("
 "%lu ms).\n"
 "Probablemente se trata de un error en el controlador ALSA «%s». Informe de "
@@ -1091,6 +1354,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Unidad de manos libres (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Puerta de enlace de audio para manos libres (HFP)"
 
@@ -1108,6 +1372,18 @@ msgid ""
 "or no> "
 msgstr ""
 "source_name=<nombre para la fuente> source_properties=<propiedades para la "
+<<<<<<< HEAD
+"fuente> source_master=<nombre de la fuente para filtrar> sink_name=<nombre "
+"para el destino> sink_properties=<propiedades para el destino> "
+"sink_master=<nombre del destino para filtrar> adjust_time=<cada cuánto "
+"reajustar la tasa, en segundos> adjust_threshold=<cuánto se debe reajustar "
+"la deriva, en milisegundos> format=<formato de la muestra> rate=<tasa de "
+"muestreo> channels=<número de canales> channel_map=<mapa de canales> "
+"aec_method=<implementación para usar> aec_args=<parámetros para el motor "
+"AEC> save_aec=<guardar datos AEC en /tmp> autoloaded=<se configura si este "
+"módulo se carga automáticamente> use_volume_sharing=<sí o no> "
+"use_master_format=<sí o no> "
+=======
 "fuente> source_master=<nombre de la fuente que filtrar> sink_name=<nombre "
 "para el destino> sink_properties=<propiedades para el destino> "
 "sink_master=<nombre del destino que filtrar> adjust_time=<cada cuánto "
@@ -1118,6 +1394,7 @@ msgstr ""
 "save_aec=<guardar datos AEC en /tmp> autoloaded=<se configura si este módulo "
 "se carga automáticamente> use_volume_sharing=<sí o no> use_master_format=<sí "
 "o no> "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #. add on profile
 #: src/modules/macosx/module-coreaudio-device.c:825
@@ -1127,7 +1404,11 @@ msgstr "Activado"
 #: src/modules/module-allow-passthrough.c:71
 #: src/modules/module-always-sink.c:80
 msgid "Dummy Output"
+<<<<<<< HEAD
+msgstr "Salida Ficticia"
+=======
 msgstr "Salida ficticia"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-always-sink.c:34
 msgid "Always keeps at least one sink loaded even if it's a null one"
@@ -1135,7 +1416,11 @@ msgstr "Mantiene siempre un destino activo, aunque sea nulo"
 
 #: src/modules/module-always-source.c:35
 msgid "Always keeps at least one source loaded even if it's a null one"
+<<<<<<< HEAD
+msgstr "Siempre mantiene cargada al menos una fuente aunque sea nula"
+=======
 msgstr "Siempre mantiene cargada al menos una fuente, aunque sea nula"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-equalizer-sink.c:68
 msgid "General Purpose Equalizer"
@@ -1154,8 +1439,13 @@ msgstr ""
 "canales> autoloaded=<configurado si este módulo se carga automáticamente> "
 "use_volume_sharing=<sí o no> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr "Ecualizador basado en FFT en %s"
@@ -1181,6 +1471,17 @@ msgid ""
 "is being loaded automatically> "
 msgstr ""
 "sink_name=<nombre para el destino> sink_properties=<propiedades para el "
+<<<<<<< HEAD
+"destino> master=<nombre del destino para filtrar> format=<formato de "
+"muestra> rate=<tasa de muestreo> channels=<número de canales> "
+"channel_map=<mapa de los canales de entrada> plugin=<nombre del complemento "
+"LADSPA> label=<etiqueta del complemento LADSPA> control=<lista de los "
+"valores de control de entrada separados por comas> "
+"input_ladspaport_map=<lista de los nombres de puertos de entrada LADSPA "
+"separados por comas> output_ladspaport_map=<lista de los nombres de puertos "
+"de salida LADSPA separados por comas> autoloaded=<seleccionar si este módulo "
+"se carga automáticamente> "
+=======
 "destino> master=<nombre del destino que filtrar> format=<formato de muestra> "
 "rate=<tasa de muestreo> channels=<número de canales> channel_map=<mapa de "
 "los canales de entrada> plugin=<nombre del complemento LADSPA> "
@@ -1190,12 +1491,17 @@ msgstr ""
 "output_ladspaport_map=<lista de los nombres de puertos de salida LADSPA "
 "separados por comas> autoloaded=<configurar si este módulo se carga "
 "automáticamente> "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-null-sink.c:46
 msgid "Clocked NULL sink"
 msgstr "Destino nulo sincronizado"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+=======
 #: src/modules/module-null-sink.c:356
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Null Output"
 msgstr "Salida nula"
 
@@ -1204,6 +1510,14 @@ msgstr "Salida nula"
 msgid "Failed to set format: invalid format string %s"
 msgstr "Error al configurar el formato: cadena de formato %s no válida"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+#, c-format
+msgid "Failed to set format: invalid format string %s"
+msgstr "No se pudo ajustar el formato: la cadena de formato %s no es válida"
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/module-rygel-media-server.c:506
 #: src/modules/module-rygel-media-server.c:544
 #: src/modules/module-rygel-media-server.c:903
@@ -1222,14 +1536,24 @@ msgstr "Audio en @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Túnel para %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Túnel a %s/%s"
@@ -1248,6 +1572,13 @@ msgid ""
 "left_hrir.wav hrir_right=/path/to/optional/right_hrir.wav autoloaded=<set if "
 "this module is being loaded automatically> "
 msgstr ""
+<<<<<<< HEAD
+"sink_name=<nombre para el destino> sink_properties=<propiedades para el "
+"destino> master=<nombre del destino para filtrar> format=<formato de "
+"muestra> rate=<tasa de muestreo> channels=<número de canales> "
+"channel_map=<mapa de canales> use_volume_sharing=<yes o no> "
+"force_flat_volume=<yes o no> hrir=/ruta/a/left_hrir.wav "
+=======
 "sink_name=<nombre del destino> sink_properties=<propiedades del destino> "
 "master=<nombre del destino que filtrar> sink_master=<nombre del destino que "
 "filtrar> format=<formato de muestra> rate=<tasa de muestreo> "
@@ -1256,18 +1587,27 @@ msgstr ""
 "left_hrir. wav hrir_left=/ruta/a/left_hrir.wav hrir_right=/ruta/a/opcional/"
 "right_hrir.wav autoloaded=<configurar si este módulo se carga "
 "automáticamente> "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/raop/module-raop-discover.c:295
 msgid "Unknown device model"
 msgstr "Modelo de dispositivo desconocido"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Perfil estándar de RAOP"
 
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
+<<<<<<< HEAD
+msgstr "Servidor de Sonido PulseAudio"
+=======
 msgstr "Servidor de sonido PulseAudio"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulse/channelmap.c:105
 msgid "Front Center"
@@ -1472,7 +1812,10 @@ msgstr "Superior trasero derecho"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(no válido)"
 
@@ -1547,9 +1890,15 @@ msgid ""
 "over the native protocol. Don't do that.)"
 msgstr ""
 "XDG_RUNTIME_DIR (%s) no es de nuestra propiedad (usuario %d), sino del "
+<<<<<<< HEAD
+"usuario %d. Puede pasar, por ejemplo, al intentar conectarse como "
+"superusuario a un servidor PulseAudio que se ejecuta sin privilegios de "
+"administrador mediante el protocolo nativo. No lo haga."
+=======
 "usuario %d. (Esto puede pasar, por ejemplo, al intentar conectarse como "
 "superusuario a un servidor PulseAudio que se ejecuta sin privilegios de "
 "administrador mediante el protocolo nativo. No lo haga.)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulsecore/core-util.h:97
 msgid "yes"
@@ -1580,11 +1929,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "El destino del registro no es válido."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Audio Interno"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Audio Interno"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Módem"
 
@@ -1859,7 +2216,11 @@ msgstr "Error al configurar la transmisión del monitor: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Ha fallado pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Fallo de conexión: %s"
@@ -1871,7 +2232,11 @@ msgstr "Se tiene EOF."
 #: src/utils/pacat.c:581
 #, c-format
 msgid "pa_stream_write() failed: %s"
+<<<<<<< HEAD
+msgstr "pa_stream_write() falló: %s"
+=======
 msgstr "Ha fallado pa_stream_write(): %s"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:605
 #, c-format
@@ -1967,6 +2332,10 @@ msgid ""
 msgstr ""
 "%s [opciones]\n"
 "%s\n"
+<<<<<<< HEAD
+"\n"
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\n"
 "  -h, --help                            Mostrar esta ayuda\n"
 "      --version                         Mostrar la versión\n"
@@ -1989,6 +2358,46 @@ msgstr ""
 "servidor\n"
 "      --stream-name=NOMBRE              Cómo llamar a esta transmisión en el "
 "servidor\n"
+<<<<<<< HEAD
+"      --stream-name=NOMBRE           Cómo llamar a este flujo en el "
+"servidor\n"
+"      --volume=VOLUMEN               Volumen inicial (lineal) de 0 a 65536\n"
+"      --rate=TASA                    Tasa de muestreo en Hz (pred. 44100)\n"
+"      --format=FORMATO               Tipo de muestra: s16le, s16be, u8,\n"
+"                                     float32le, float32be, ulaw, alaw, "
+"s32le,\n"
+"                                     s32be, s24le, s24be, s24-32le, "
+"s24-32be\n"
+"                                     (pred. s16ne)\n"
+"      --channels=CANALES             Número de canales: 1 mono, 2 estéreo\n"
+"                                     (pred. 2)\n"
+"      --channel-map=MAPA             Mapa de canales\n"
+"      --fix-format                   Usa el formato de muestra que indique "
+"la\n"
+"                                     fuente o destino a la que se conecta\n"
+"      --fix-rate                     Usa la tasa de muestreo que indique la\n"
+"                                     fuente o destino a la que se conecta\n"
+"      --fix-channels                 Usa el número y mapa de canales que "
+"indique\n"
+"                                     la fuente o destino a la que se "
+"conecta\n"
+"      --no-remix                     No mezcla canales\n"
+"      --no-remap                     Mapea canales por índice, no por "
+"nombre\n"
+"      --latency=BYTES                Solicita la latencia indicada en bytes\n"
+"      --process-time=BYTES           Solicita el tiempo de proceso indicado\n"
+"                                     para cada petición en bytes\n"
+"      --latency-msec=MSEG            Solicita la latencia indicada en ms\n"
+"      --process-time-msec=MSEG       Solicita el tiempo de proceso indicado\n"
+"                                     para cada petición en ms\n"
+"      --property=PROPIEDAD=VALOR     Da el VALOR a la PROPIEDAD\n"
+"      --raw                          Graba/reproduce datos PCM en crudo\n"
+"      --passthrough                  Túnel\n"
+"      --file-format[=FORMATO]        Graba/reproduce datos PCM formateados\n"
+"      --list-file-formats            Lista los formatos disponibles\n"
+"      --monitor-stream=ÍNDICE        Graba de la entrada con ÍNDICE del "
+"destino\n"
+=======
 "      --volume=VOLUMEN                  Especificar el volumen inicial "
 "(lineal) en el rango 0...65536\n"
 "      --rate=TASA                       La tasa de muestreo en Hz (por "
@@ -2035,6 +2444,7 @@ msgstr ""
 "disponibles.\n"
 "      --monitor-stream=ÍNDICE           Grabar desde la entrada del destino "
 "con el índice ÍNDICE.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:793
 msgid "Play back encoded audio files on a PulseAudio sound server."
@@ -2061,7 +2471,11 @@ msgid ""
 "Play back audio data from STDIN or the specified file on a PulseAudio sound "
 "server."
 msgstr ""
+<<<<<<< HEAD
+"Reproducir datos de audio desde STDIN o el archivo especificado en un "
+=======
 "Reproducir datos de audio desde STDIN o del archivo especificado en un "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "servidor de sonido PulseAudio."
 
 #: src/utils/pacat.c:819
@@ -2075,7 +2489,11 @@ msgstr ""
 "Compilado con libpulse %s\n"
 "Enlazado con libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nombre de cliente no válido '%s'"
@@ -2148,7 +2566,11 @@ msgstr ""
 "Aviso: la especificación de muestra especificada se sobrescribirá con la "
 "especificación del archivo."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Error al determinar la especificación de la muestra del archivo."
 
@@ -2184,7 +2606,11 @@ msgstr "playback"
 msgid "Failed to set media name."
 msgstr "Error al configurar el nombre del medio."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Ha fallado pa_mainloop_new()."
 
@@ -2192,11 +2618,19 @@ msgstr "Ha fallado pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Ha fallado io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_context_new() failed."
 msgstr "Ha fallado pa_context_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Ha fallado pa_context_connect(): %s"
@@ -2205,21 +2639,39 @@ msgstr "Ha fallado pa_context_connect(): %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Ha fallado pa_context_rttime_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_run() failed."
 msgstr "Ha fallado pa_mainloop_run()."
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NOMBRE [PARÁMETROS ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+=======
 #: src/utils/pacmd.c:51 src/utils/pactl.c:2643
 msgid "NAME [ARGS ...]"
 msgstr "NOMBRE [PARÁMETROS ...]"
 
 #: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:2644
 #: src/utils/pactl.c:2651 src/utils/pactl.c:2652
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N"
 msgstr "NOMBRE|NÚMERO"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NOMBRE"
 
@@ -2231,7 +2683,11 @@ msgstr "NOMBRE|NÚMERO VOLUMEN"
 msgid "#N VOLUME"
 msgstr "NÚMERO VOLUMEN"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NOMBRE|NÚMERO 1|0"
 
@@ -2267,7 +2723,11 @@ msgstr "RUTA"
 msgid "FILENAME SINK|#N"
 msgstr "ARCHIVO DESTINO|NÚMERO"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "NÚMERO DESTINO|FUENTE"
 
@@ -2275,15 +2735,27 @@ msgstr "NÚMERO DESTINO|FUENTE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD PROFILE"
 msgstr "PERFIL DE LA TARJETA"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+=======
 #: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N PORT"
 msgstr "NOMBRE|NÚMERO PUERTO"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NOMBRE-TARJETA|NÚMERO-TARJETA PUERTO COMPENSACIÓN"
 
@@ -2299,7 +2771,11 @@ msgstr "NIVEL-NUMÉRICO"
 msgid "FRAMES"
 msgstr "LOTES"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "MENSAJE DEL DESTINATARIO [PARÁMETETROS_DEL_MENSAJE]"
 
@@ -2366,24 +2842,45 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Error al obtener estadísticas: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Actualmente en uso: %u bloque conteniendo %s bytes en total.\n"
 msgstr[1] "Actualmente en uso: %u bloques conteniendo %s bytes en total.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
+<<<<<<< HEAD
+"Ubicados durante a lo largo del tiempo: %u bloque conteniendo %s bytes en "
+"total.\n"
+msgstr[1] ""
+"Ubicados durante a lo largo del tiempo: %u bloques conteniendo %s bytes en "
+"total.\n"
+
+#: src/utils/pactl.c:193
+=======
 "Asignados durante todo el tiempo de ejecución: %u bloque que contiene %s "
 "bytes en total.\n"
 msgstr[1] ""
@@ -2391,21 +2888,35 @@ msgstr[1] ""
 "bytes en total.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Tamaño de la caché de muestra: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Error al obtener información del servidor: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2422,7 +2933,11 @@ msgstr ""
 "Índice de cliente: %u\n"
 "Tamaño de grupo: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2445,6 +2960,79 @@ msgstr ""
 "Fuente por defecto: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "disponibilidad desconocida"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "disponible"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "desconocido"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "Línea de entrada"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+#, fuzzy
+msgid "Handset"
+msgstr "Auriculares"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+#, fuzzy
+msgid "Bluetooth"
+msgstr "Entrada bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Mono analógico"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "disponibilidad desconocida"
@@ -2511,11 +3099,16 @@ msgstr "Analógico"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Error al obtener información del destino: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2544,6 +3137,44 @@ msgstr ""
 "\tEspecificación de muestra: %s\n"
 "\tMapa de canales: %s\n"
 "\tMódulo propietario: %u\n"
+<<<<<<< HEAD
+"\tSilencio: %s\n"
+"\tVolumen: %s\n"
+"\t        balance %0.2f\n"
+"\tVolumen base: %s\n"
+"\tFuente que lo monitoriza: %s\n"
+"\tLatencia: %0.0f usec, configurados %0.0f usec\n"
+"\tIndicadores: %s%s%s%s%s%s%s\n"
+"\tPropiedades:\n"
+"\t\t%s\n"
+
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+#, c-format
+msgid "\tPorts:\n"
+msgstr "\tPuertos:\n"
+
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr "\tPuerto Activo: %s\n"
+
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+#, c-format
+msgid "\tFormats:\n"
+msgstr "\tFormatos:\n"
+
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 "\tSilenciado: %s\n"
 "\tVolumen: %s\n"
 "\t        balance %0.2f\n"
@@ -2580,11 +3211,16 @@ msgstr "\tFormatos:\n"
 
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Error al obtener información de la fuente: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2613,16 +3249,35 @@ msgstr ""
 "\tEspecificación de muestra: %s\n"
 "\tMapa de canales: %s\n"
 "\tMódulo propietario: %u\n"
+<<<<<<< HEAD
+"\tSilencio: %s\n"
+=======
 "\tSilenciado: %s\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\tVolumen: %s\n"
 "\t        balance %0.2f\n"
 "\tVolumen base: %s\n"
 "\tMonitor del destino: %s\n"
+<<<<<<< HEAD
+"\tLatencia: %0.0f usec, configurados %0.0f usec\n"
+=======
 "\tLatencia: %0.0f µs, configurados %0.0f µs\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\tIndicadores: %s%s%s%s%s%s\n"
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2632,11 +3287,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Error al obtener información del módulo: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2653,12 +3313,20 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Error al obtener información del cliente: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2673,12 +3341,20 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Error al obtener información de la tarjeta: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2688,33 +3364,72 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+<<<<<<< HEAD
+"Placa #%u\n"
+=======
 "Tarjeta #%u\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\tNombre: %s\n"
 "\tControlador: %s\n"
 "\tMódulo propietario: %s\n"
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tPerfiles:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1240
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (destinos: %u, fuentes: %u, prioridad: %u, disponible: %s)\n"
 
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tPerfil Activo: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+#, c-format
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
+msgstr ""
+"\t\t\tPropiedades:\n"
+"\t\t\t\t%s\n"
+
+#: src/utils/pactl.c:684
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr "\t\t\tParte de perfil/es: %s"
+
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 "\t\t%s: %s (tipo: %s, prioridad: %u, compensación de latencia: %<PRId64> "
 "µs%s%s, %s)\n"
 
@@ -2733,11 +3448,16 @@ msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tParte de perfil/es: %s"
 
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Error al obtener información de la entrada del destino: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2758,7 +3478,11 @@ msgid ""
 "\tProperties:\n"
 "\t\t%s\n"
 msgstr ""
+<<<<<<< HEAD
+"Entrada de destino #%u\n"
+=======
 "Entrada del destino #%u\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\tControlador: %s\n"
 "\tMódulo propietario: %s\n"
 "\tCliente: %s\n"
@@ -2767,21 +3491,37 @@ msgstr ""
 "\tMapa de canales: %s\n"
 "\tFormato: %s\n"
 "\tPausado: %s\n"
+<<<<<<< HEAD
+"\tSilencio: %s\n"
+"\tVolumen: %s\n"
+"\t        balance %0.2f\n"
+"\tLatencia de búfer: %0.0f usec\n"
+"\tLatencia del destino: %0.0f usec\n"
+=======
 "\tSilenciado: %s\n"
 "\tVolumen: %s\n"
 "\t        balance %0.2f\n"
 "\tLatencia de búfer: %0.0f µs\n"
 "\tLatencia del destino: %0.0f µs\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\tMétodo de remuestreo: %s\n"
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Error al obtener información de la salida de la fuente: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2811,21 +3551,37 @@ msgstr ""
 "\tMapa de canales: %s\n"
 "\tFormato: %s\n"
 "\tPausado: %s\n"
+<<<<<<< HEAD
+"\tSilencio: %s\n"
+"\tVolumen: %s\n"
+"\t        balance %0.2f\n"
+"\tLatencia de búfer: %0.0f usec\n"
+"\tLatencia de la fuente: %0.0f usec\n"
+=======
 "\tSilenciado: %s\n"
 "\tVolumen: %s\n"
 "\t        balance %0.2f\n"
 "\tLatencia del búfer: %0.0f µs\n"
 "\tLatencia de la fuente: %0.0f µs\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\tMétodo de remuestreo: %s\n"
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Error al obtener información de la muestra: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2854,16 +3610,65 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Fallo: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "Falló la operación read(): %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Fallo el envío del mensaje: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+#, fuzzy, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channel, whereas "
+"channel(s) supported = %d\n"
+msgid_plural ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel(s) supported = %d\n"
+msgstr[0] ""
+"No se pudo ajustar el volumen por no corresponder el número de canales: "
+"intentó ajustarlo para %d, pero %d es todo lo que se admite\n"
+msgstr[1] ""
+"No se pudo ajustar el volumen por no corresponder el número de canales: "
+"intentó ajustarlo para %d, pero %d es todo lo que se admite\n"
+
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2907,10 +3712,46 @@ msgstr[1] ""
 "canales %d, pero el canal o los canales compatibles = %d\n"
 
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Error al cargar la muestra: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Fin de archivo prematuro"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nuevo"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "cambiar"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "eliminar"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "desconocido"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "destino"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "fuente"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "entrada-destino"
+
+#: src/utils/pactl.c:1403
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Fin de archivo prematuro"
@@ -2944,9 +3785,29 @@ msgid "sink-input"
 msgstr "entrada-destino"
 
 #: src/utils/pactl.c:2170
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "source-output"
 msgstr "fuente-salida"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "módulo"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "cliente"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "muestra-caché"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "servidor"
+
+#: src/utils/pactl.c:1418
+=======
 #: src/utils/pactl.c:2173
 msgid "module"
 msgstr "módulo"
@@ -2964,30 +3825,82 @@ msgid "server"
 msgstr "servidor"
 
 #: src/utils/pactl.c:2185
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "card"
 msgstr "tarjeta"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Evento '%s' en %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Hay un SIGINT, saliendo."
+
+#: src/utils/pactl.c:1762
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Hay un SIGINT, saliendo."
 
 #: src/utils/pactl.c:2547
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid volume specification"
 msgstr "Especificación de volumen no válida"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volumen fuera de rango.\n"
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2581
 msgid "Volume outside permissible range.\n"
 msgstr "Volumen fuera de rango.\n"
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid number of volume specifications.\n"
 msgstr "Número de especificaciones de volumen no válido.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Especificación de volumen inconsistente.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opciones]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPO]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "ARCHIVO [NOMBRE]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NOMBRE [DESTINO]"
+
+#: src/utils/pactl.c:1857
+=======
 #: src/utils/pactl.c:2606
 msgid "Inconsistent volume specification.\n"
 msgstr "Especificación de volumen inconsistente.\n"
@@ -3017,26 +3930,47 @@ msgid "NAME [SINK]"
 msgstr "NOMBRE [DESTINO]"
 
 #: src/utils/pactl.c:2653
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N VOLUME [VOLUME ...]"
 msgstr "NOMBRE|NÚMERO VOLUMEN [VOLUMEN ...]"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1858
+=======
 #: src/utils/pactl.c:2654
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N VOLUME [VOLUME ...]"
 msgstr "NÚMERO VOLUMEN [VOLUMEN ...]"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1859
+=======
 #: src/utils/pactl.c:2655
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0|toggle"
 msgstr "NOMBRE|NÚMERO 1|0|toggle"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1860
+=======
 #: src/utils/pactl.c:2656
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N 1|0|toggle"
 msgstr "NÚMERO 1|0|toggle"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1861
+=======
 #: src/utils/pactl.c:2657
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N FORMATS"
 msgstr "NÚMERO FORMATOS"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3045,17 +3979,27 @@ msgid ""
 msgstr ""
 "\n"
 "Se pueden usar los nombres especiales @DEFAULT_SINK@, @DEFAULT_SOURCE@ y\n"
+<<<<<<< HEAD
+"@DEFAULT_MONITOR@ para indicar el destino, fuente y monitor "
+"predeterminados.\n"
+
+#: src/utils/pactl.c:1868
+=======
 "@DEFAULT_MONITOR@ para indicar destino, fuente y monitor predeterminados.\n"
 
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -n, --client-name=NAME                How to call this client on the "
@@ -3072,7 +4016,11 @@ msgstr ""
 "  -n, --client-name=NAME                Cómo llamar a este cliente en el "
 "servidor\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3083,44 +4031,87 @@ msgstr ""
 "Compilado con libpulse %s\n"
 "Enlazado con libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Valor de formato no válido «%s»"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "No indique nada, o bien uno de: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+=======
 #: src/utils/pactl.c:2788
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Please specify a sample file to load"
 msgstr "Especifique un archivo de muestra para cargar"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1989
+=======
 #: src/utils/pactl.c:2801
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to open sound file."
 msgstr "Error al abrir el archivo de audio."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr "Aviso: error al determinar la especificación de la muestra del archivo."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Debe especificar un nombre de muestra para reproducir"
+
+#: src/utils/pactl.c:2023
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Debe especificar un nombre de muestra para reproducir"
 
 #: src/utils/pactl.c:2835
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sample name to remove"
 msgstr "Debe especificar un nombre de muestra para eliminar"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Debe especificar un índice para la entrada al destino y un destino"
+
+#: src/utils/pactl.c:2042
+=======
 #: src/utils/pactl.c:2844
 msgid "You have to specify a sink input index and a sink"
 msgstr "Debe especificar un índice para la entrada al destino y un destino"
 
 #: src/utils/pactl.c:2854
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a source"
 msgstr "Debe especificar un índice de salida de la fuente y una fuente"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Debe especificar un nombre de módulo y los argumentos."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Debe indicar un nombre o índice de módulo"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2869
 msgid "You have to specify a module name and arguments."
 msgstr "Debe especificar un nombre de módulo y los argumentos."
@@ -3130,17 +4121,26 @@ msgid "You have to specify a module index or name"
 msgstr "Debe indicar un nombre o índice de módulo"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "No puede especificar más de un destino. Tiene que especificar un valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "La especificación de suspensión no es válida."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "La especificación de suspensión no es válida."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3148,10 +4148,38 @@ msgstr ""
 "No puede especificar más de una fuente. Tiene que especificar un valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+=======
 #: src/utils/pactl.c:2939
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Debe especificar un nombre/índice de la tarjeta y un nombre de perfil"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Debe especificar un nombre/índice de destino y un nombre de puerto"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Debe indicar un nombre de destino"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Debe especificar un nombre/índice de fuente y un nombre de puerto"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Debe indicar un nombre de fuente"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Debe indicar un nombre de destino"
+
+#: src/utils/pactl.c:2196
+=======
 #: src/utils/pactl.c:2950
 msgid "You have to specify a sink name/index and a port name"
 msgstr "Debe especificar un nombre/índice de destino y un nombre de puerto"
@@ -3173,6 +4201,7 @@ msgid "You have to specify a sink name/index"
 msgstr "Debe especificar un nombre/índice de destino"
 
 #: src/utils/pactl.c:3008
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Debe especificar un nombre/índice de destino y un volumen"
 
@@ -3180,6 +4209,22 @@ msgstr "Debe especificar un nombre/índice de destino y un volumen"
 msgid "You have to specify a source name/index"
 msgstr "Debe especificar un nombre/índice de fuente"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Debe indicar un nombre de fuente"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Debe especificar un nombre/índice de fuente y un volumen"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Debe especificar un índice de entrada del destino y un volumen"
+
+#: src/utils/pactl.c:2237
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Debe especificar un nombre/índice de fuente y un volumen"
@@ -3189,29 +4234,58 @@ msgid "You have to specify a sink input index and a volume"
 msgstr "Debe especificar un índice de entrada del destino y un volumen"
 
 #: src/utils/pactl.c:3049
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid sink input index"
 msgstr "El índice de entrada del destino no es válido"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a volume"
 msgstr "Debe indicar un índice de salida de fuente y un volumen"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid source output index"
 msgstr "El índice de salida de fuente no es válido"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+#, fuzzy
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Debe especificar un nombre/índice de destino y una acción de silenciar (0, 1 "
 "o 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid mute specification"
 msgstr "La especificación de silenciar no es válida"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+#, fuzzy
+msgid ""
+"You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
+msgstr "Debe especificar un nombre/índice de fuente y un booleano para mudo"
+
+#: src/utils/pactl.c:2314
+#, fuzzy
+=======
 #: src/utils/pactl.c:3111
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
@@ -3220,16 +4294,31 @@ msgstr ""
 "o 'toggle')"
 
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Debe especificar un índice de entrada de destino y una acción de silenciar ("
 "0, 1 o 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+=======
 #: src/utils/pactl.c:3131
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid sink input index specification"
 msgstr "La especificación del índice de entrada de destino no es válida"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2332
+#, fuzzy
+msgid ""
+"You have to specify a source output index and a mute action (0, 1, or "
+"'toggle')"
+msgstr "Debe especificar un índice de salida y un indicador de silencio"
+
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3144
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
@@ -3239,6 +4328,7 @@ msgstr ""
 "1 o 'toggle')"
 
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid source output index specification"
 msgstr "Especificación de índice de salida de fuente no válida"
 
@@ -3255,7 +4345,22 @@ msgstr ""
 "Se ingresaron argumentos de más, serán ignorados. Tenga en cuenta que todos "
 "los parámetros de mensaje deben ingresarse como una sóla cadena."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "Debe especificar un nombre/índice de destino y un nombre de puerto"
+
+#: src/utils/pactl.c:2360
+msgid ""
+"Excess arguments given, they will be ignored. Note that all message "
+"parameters must be given as a single string."
+msgstr ""
+
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3263,17 +4368,29 @@ msgstr ""
 "Debe especificar un nombre/índice de destino y una lista de formatos "
 "admitidos separados por punto y coma"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Debe especificar un nombre/índice de tarjeta, un nombre de puerto y una "
 "compensación de latencia"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+=======
 #: src/utils/pactl.c:3201
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Could not parse latency offset"
 msgstr "No se ha podido analizar la compensación de latencia"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "No se ha especificado ningún comando válido."
 
@@ -3318,7 +4435,11 @@ msgid "WARNING: Child process terminated by signal %u\n"
 msgstr "AVISO: el proceso secundario ha terminado por la señal %u\n"
 
 #: src/utils/pasuspender.c:228
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options] -- PROGRAM [ARGUMENTS ...]\n"
 "\n"
diff --git a/po/fi.po b/po/fi.po
index 2cf65c23e..92dcee566 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,9 +9,15 @@ msgstr ""
 "Project-Id-Version: git trunk\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-06-29 20:27+0000\n"
+"Last-Translator: Robin Lahtinen <robin.lahtinen@gmail.com>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2023-02-10 20:20+0000\n"
 "Last-Translator: Jan Kuparinen <copper_fin@hotmail.com>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: Finnish <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/fi/>\n"
 "Language: fi\n"
@@ -19,7 +25,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.7\n"
+=======
 "X-Generator: Weblate 4.15.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -175,6 +185,7 @@ msgstr ""
 #: src/daemon/cmdline.c:246
 msgid "--daemonize expects boolean argument"
 msgstr "--daemonize vaatii totuusarvoisen argumentin"
+<<<<<<< HEAD
 
 #: src/daemon/cmdline.c:254
 msgid "--fail expects boolean argument"
@@ -183,10 +194,10 @@ msgstr "--fail vaatii totuusarvoisen argumentin"
 #: src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
-"of error, warn, notice, info, debug)."
+"of debug, info, notice, warn, error)."
 msgstr ""
 "--log-level vaatii lokikirjoituksen tason argumentiksi (joko numero väliltä "
-"0..4 tai yksi seuraavista: error, warn, notice, info, debug)."
+"0..4 tai yksi seuraavista: debug, info, notice, warn, error)."
 
 #: src/daemon/cmdline.c:277
 msgid "--high-priority expects boolean argument"
@@ -393,6 +404,272 @@ msgstr "Uuden dl-lataaminen varaaminen epäonnistui."
 msgid "Failed to add bind-now-loader."
 msgstr "bind-now-loaderin lisääminen epäonnistui."
 
+#: src/daemon/main.c:265
+=======
+
+#: src/daemon/cmdline.c:254
+msgid "--fail expects boolean argument"
+msgstr "--fail vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:265
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of error, warn, notice, info, debug)."
+msgstr ""
+"--log-level vaatii lokikirjoituksen tason argumentiksi (joko numero väliltä "
+"0..4 tai yksi seuraavista: error, warn, notice, info, debug)."
+
+#: src/daemon/cmdline.c:277
+msgid "--high-priority expects boolean argument"
+msgstr "--high-priority vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:285
+msgid "--realtime expects boolean argument"
+msgstr "--realtime vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:293
+msgid "--disallow-module-loading expects boolean argument"
+msgstr "--disallow-module-loading vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:301
+msgid "--disallow-exit expects boolean argument"
+msgstr "--disallow-exit vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:309
+msgid "--use-pid-file expects boolean argument"
+msgstr "--use-pid-file vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:328
+msgid ""
+"Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Virheellinen lokikohde: käytä jotain seuraavista: 'syslog', 'stderr' tai "
+"'auto' tai kelvollista tiedostonimeä 'file:<polku>', 'newfile:<polku>'."
+
+#: src/daemon/cmdline.c:330
+msgid ""
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
+"name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Virheellinen lokikohde: käytä jotain seuraavista: 'syslog', 'stderr' tai "
+"'auto' tai kelvollista tiedostonimeä 'file:<polku>', 'newfile:<polku>'."
+
+#: src/daemon/cmdline.c:338
+msgid "--log-time expects boolean argument"
+msgstr "--log-time vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:346
+msgid "--log-meta expects boolean argument"
+msgstr "--log-meta vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:366
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "Virheellinen uudelleennäytteistyksen tapa ”%s”."
+
+#: src/daemon/cmdline.c:373
+msgid "--system expects boolean argument"
+msgstr "--system vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:381
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "--no-cpu-limit vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:389
+msgid "--disable-shm expects boolean argument"
+msgstr "--disable-shm vaatii totuusarvoisen argumentin"
+
+#: src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr "'--enable-memfd' odottaa loogista argumenttia"
+
+#: src/daemon/daemon-conf.c:270
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] Virheellinen lokikirjoituksen kohde ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:270
+=======
+#: src/daemon/daemon-conf.c:285
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] Virheellinen lokikirjoituksen taso ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:279
+=======
+#: src/daemon/daemon-conf.c:300
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] Virheellinen uudelleennäytteistyksen tapa ”%s”."
+
+#: src/daemon/daemon-conf.c:322
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] Virheellinen rlimit ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:284
+=======
+#: src/daemon/daemon-conf.c:342
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr "[%s:%u] Virheellinen näytemuoto ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:287 src/daemon/main.c:292
+=======
+#: src/daemon/daemon-conf.c:359 src/daemon/daemon-conf.c:376
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr "[%s:%u] Virheellinen näytteenottotaajuus ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:299
+=======
+#: src/daemon/daemon-conf.c:399
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr "[%s:%u] Virheelliset näytekanavat ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:315
+=======
+#: src/daemon/daemon-conf.c:416
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr "[%s:%u] Virheellinen kanavakartta ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:331
+=======
+#: src/daemon/daemon-conf.c:433
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr "[%s:%u] Virheellinen fragmenttimäärä ”%s”."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:360
+msgid "System wide mode unsupported on this platform."
+msgstr "Järjestelmänlaajuista tilaa ei tueta tällä alustalla."
+
+#: src/daemon/main.c:650
+msgid "Failed to parse command line."
+msgstr "Komentorivin jäsentäminen epäonnistui."
+
+#: src/daemon/main.c:689
+=======
+#: src/daemon/daemon-conf.c:450
+#, c-format
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr "[%s:%u] Virheellinen fragmenttikoko ”%s”."
+
+#: src/daemon/daemon-conf.c:467
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr "[%s:%u] Virheellinen nice-taso ”%s”."
+
+#: src/daemon/daemon-conf.c:552
+#, c-format
+msgid "[%s:%u] Invalid server type '%s'."
+msgstr "[%s:%u] Virheellinen palvelintyyppi ”%s”."
+
+#: src/daemon/daemon-conf.c:685
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "Asetustiedoston avaaminen epäonnistui: %s"
+
+#: src/daemon/daemon-conf.c:701
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+msgid ""
+"The specified default channel map has a different number of channels than "
+"the specified default number of channels."
+msgstr ""
+<<<<<<< HEAD
+"Järjestelmätila hylättiin ei-pääkäyttäjälle. Käynnistetään vain D-Bus-"
+"palvelimen hakupalvelu."
+
+=======
+"Kanavien oletusmäärä ja oletuskanavakartan kanavien määrä poikkeavat "
+"toisistaan."
+
+#: src/daemon/daemon-conf.c:788
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### Luettu asetustiedostosta: %s ###\n"
+
+#: src/daemon/dumpmodules.c:57
+#, c-format
+msgid "Name: %s\n"
+msgstr "Nimi: %s\n"
+
+#: src/daemon/dumpmodules.c:60
+#, c-format
+msgid "No module information available\n"
+msgstr "Moduulitietoja ei saatavilla\n"
+
+#: src/daemon/dumpmodules.c:63
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versio: %s\n"
+
+#: src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Description: %s\n"
+msgstr "Kuvaus: %s\n"
+
+#: src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Author: %s\n"
+msgstr "Tekijä: %s\n"
+
+#: src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Käyttö: %s\n"
+
+#: src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Lataa kerran: %s\n"
+
+#: src/daemon/dumpmodules.c:72
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "VAROITUS VANHENTUNEISUUDESTA: %s\n"
+
+#: src/daemon/dumpmodules.c:76
+#, c-format
+msgid "Path: %s\n"
+msgstr "Polku: %s\n"
+
+#: src/daemon/ltdl-bind-now.c:75
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "Moduulin %s: %s avaaminen epäonnistui"
+
+#: src/daemon/ltdl-bind-now.c:126
+msgid "Failed to find original lt_dlopen loader."
+msgstr "Alkuperäisen lt_dlopen-lataimen löytäminen epäonnistui."
+
+#: src/daemon/ltdl-bind-now.c:131
+msgid "Failed to allocate new dl loader."
+msgstr "Uuden dl-lataaminen varaaminen epäonnistui."
+
+#: src/daemon/ltdl-bind-now.c:144
+msgid "Failed to add bind-now-loader."
+msgstr "bind-now-loaderin lisääminen epäonnistui."
+
 #: src/daemon/main.c:265
 #, c-format
 msgid "Failed to find user '%s'."
@@ -449,6 +726,7 @@ msgstr ""
 "Järjestelmätila hylättiin ei-pääkäyttäjälle. Käynnistetään vain D-Bus-"
 "palvelimen hakupalvelu."
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/main.c:788
 #, c-format
 msgid "Failed to kill daemon: %s"
@@ -474,14 +752,774 @@ msgstr "--start-valitsinta ei tueta järjestelmätilassa."
 #, c-format
 msgid "User-configured server at %s, refusing to start/autospawn."
 msgstr ""
-"Käyttäjän määrittämä palvelin osoitteessa %s, kieltäytyy käynnistymästä/"
-"automaattisesta luomisesta."
 
 #: src/daemon/main.c:873
 #, c-format
 msgid ""
 "User-configured server at %s, which appears to be local. Probing deeper."
 msgstr ""
+
+#: src/daemon/main.c:878
+msgid "Running in system mode, but --disallow-exit not set."
+msgstr "Suoritetaan järjestelmätilassa, mutta '--disallow-exit' ei asetettuna."
+
+#: src/daemon/main.c:881
+msgid "Running in system mode, but --disallow-module-loading not set."
+msgstr ""
+"Suoritetaan järjestelmätilassa, mutta '--disallow-module-loading' ei "
+"asetettuna."
+
+#: src/daemon/main.c:884
+msgid "Running in system mode, forcibly disabling SHM mode."
+msgstr ""
+"Suoritetaan järjestelmätilassa, otetaan SHM-tila pakotetusti pois käytöstä."
+
+#: src/daemon/main.c:889
+msgid "Running in system mode, forcibly disabling exit idle time."
+msgstr ""
+"Suoritetaan järjestelmätilassa, otetaan poistumisen joutenoloaika "
+"pakotetusti pois käytöstä."
+
+#: src/daemon/main.c:922
+msgid "Failed to acquire stdio."
+msgstr "stdio:n saaminen epäonnistui."
+
+#: src/daemon/main.c:928 src/daemon/main.c:999
+#, c-format
+msgid "pipe() failed: %s"
+msgstr "pipe() epäonnistui: %s"
+
+#: src/daemon/main.c:933 src/daemon/main.c:1004
+#, c-format
+msgid "fork() failed: %s"
+msgstr "fork() epäonnistui: %s"
+
+#: src/daemon/main.c:948 src/daemon/main.c:1019 src/utils/pacat.c:562
+#, c-format
+msgid "read() failed: %s"
+msgstr "read() epäonnistui: %s"
+
+#: src/daemon/main.c:954
+msgid "Daemon startup failed."
+msgstr "Taustaprosessin käynnistys epäonnistui."
+
+#: src/daemon/main.c:987
+#, c-format
+msgid "setsid() failed: %s"
+msgstr "setsid() epäonnistui: %s"
+
+#: src/daemon/main.c:1119
+msgid "Failed to get machine ID"
+msgstr "Konetunnisteen nouto epäonnistui"
+
+#: src/daemon/main.c:1145
+msgid ""
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\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: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://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/."
+
+<<<<<<< HEAD
+#: src/daemon/main.c:1161
+msgid "pa_pid_file_create() failed."
+msgstr "pa_pid_file_create() epäonnistui."
+
+#: src/daemon/main.c:1193
+msgid "pa_core_new() failed."
+msgstr "pa_core_new() epäonnistui."
+
+#: src/daemon/main.c:1268
+msgid "command line arguments"
+msgstr "komentorivin argumentteja"
+
+#: src/daemon/main.c:1275
+=======
+#: src/daemon/main.c:820
+msgid "Root privileges required."
+msgstr "Pääkäyttäjän (root) oikeudet vaaditaan."
+
+#: src/daemon/main.c:827
+msgid "--start not supported for system instances."
+msgstr "--start-valitsinta ei tueta järjestelmätilassa."
+
+#: src/daemon/main.c:867
+#, c-format
+msgid "User-configured server at %s, refusing to start/autospawn."
+msgstr ""
+"Käyttäjän määrittämä palvelin osoitteessa %s, kieltäytyy käynnistymästä/"
+"automaattisesta luomisesta."
+
+#: src/daemon/main.c:873
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+<<<<<<< HEAD
+"Demonin alustaminen epäonnistui käynnistyskomentoja suoritettaessa "
+"esiintyvien virheiden vuoksi. Komentojen lähde: %s"
+
+#: src/daemon/main.c:1280
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr ""
+"Taustaprosessin käynnistys ilman ladattavia moduuleita, kieltäydytään "
+"toiminnasta."
+
+#: src/daemon/pulseaudio.desktop.in:4
+msgid "PulseAudio Sound System"
+msgstr "PulseAudio-äänijärjestelmä"
+
+#: src/daemon/pulseaudio.desktop.in:5
+msgid "Start the PulseAudio Sound System"
+msgstr "Käynnistä PulseAudio-äänijärjestelmä"
+
+#: src/modules/alsa/alsa-mixer.c:2708
+msgid "Input"
+msgstr "Sisääntulo"
+
+#: src/modules/alsa/alsa-mixer.c:2709
+msgid "Docking Station Input"
+msgstr "Telakan sisääntulo"
+
+#: src/modules/alsa/alsa-mixer.c:2710
+msgid "Docking Station Microphone"
+msgstr "Telakan mikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2711
+msgid "Docking Station Line In"
+msgstr "Telakan sisääntulo"
+
+#: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
+msgid "Line In"
+msgstr "Linjasisääntulo"
+
+#: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+msgid "Microphone"
+msgstr "Mikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2714 src/modules/alsa/alsa-mixer.c:2798
+msgid "Front Microphone"
+msgstr "Etumikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2715 src/modules/alsa/alsa-mixer.c:2799
+msgid "Rear Microphone"
+msgstr "takamikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2716
+msgid "External Microphone"
+msgstr "Ulkoinen mikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2717 src/modules/alsa/alsa-mixer.c:2801
+msgid "Internal Microphone"
+msgstr "Sisäinen mikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+#: src/utils/pactl.c:295
+msgid "Radio"
+msgstr "Radio"
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:296
+msgid "Video"
+msgstr "Video"
+
+#: src/modules/alsa/alsa-mixer.c:2720
+msgid "Automatic Gain Control"
+msgstr "Automaattinen äänenvoimakkuuden säätö"
+
+#: src/modules/alsa/alsa-mixer.c:2721
+msgid "No Automatic Gain Control"
+msgstr "Ei automaattista äänenvoimakkuuden säätöä"
+
+#: src/modules/alsa/alsa-mixer.c:2722
+msgid "Boost"
+msgstr "Vahvistus"
+
+#: src/modules/alsa/alsa-mixer.c:2723
+msgid "No Boost"
+msgstr "Ei vahvistusta"
+
+#: src/modules/alsa/alsa-mixer.c:2724
+msgid "Amplifier"
+msgstr "Vahvistin"
+
+#: src/modules/alsa/alsa-mixer.c:2725
+msgid "No Amplifier"
+msgstr "Ei vahvistinta"
+
+#: src/modules/alsa/alsa-mixer.c:2726
+msgid "Bass Boost"
+msgstr "Bassonvahvistus"
+
+#: src/modules/alsa/alsa-mixer.c:2727
+msgid "No Bass Boost"
+msgstr "Ei basson vahvistusta"
+
+#: src/modules/alsa/alsa-mixer.c:2728
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+msgid "Speaker"
+msgstr "Kaiutin"
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:286
+msgid "Headphones"
+msgstr "Analoginen kuulokeliitäntä"
+
+#: src/modules/alsa/alsa-mixer.c:2796
+msgid "Analog Input"
+msgstr "Analoginen sisääntulo"
+
+#: src/modules/alsa/alsa-mixer.c:2800
+msgid "Dock Microphone"
+msgstr "Telakan mikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2802
+msgid "Headset Microphone"
+msgstr "Kuulokkeiden mikrofoni"
+
+#: src/modules/alsa/alsa-mixer.c:2806
+msgid "Analog Output"
+msgstr "Analoginen ulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:2808
+msgid "Headphones 2"
+msgstr "Kuulokkeet 2"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+msgid "Headphones Mono Output"
+msgstr "Kuulokkeiden monoulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:2810
+msgid "Line Out"
+msgstr "Linjaulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:2811
+msgid "Analog Mono Output"
+msgstr "Analoginen monoulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:2812
+msgid "Speakers"
+msgstr "Kaiuttimet"
+
+#: src/modules/alsa/alsa-mixer.c:2813
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
+
+#: src/modules/alsa/alsa-mixer.c:2814
+msgid "Digital Output (S/PDIF)"
+msgstr "Digitaalinen ulostulo (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2815
+msgid "Digital Input (S/PDIF)"
+msgstr "Digitaalinen sisääntulo (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2816
+msgid "Multichannel Input"
+msgstr "Monikanavainen sisääntulo"
+
+#: src/modules/alsa/alsa-mixer.c:2817
+msgid "Multichannel Output"
+msgstr "Monikanavainen ulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:2818
+msgid "Game Output"
+msgstr "Peli ulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+msgid "Chat Output"
+msgstr "Chatti ulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+msgstr "Chatti sisääntulo"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+msgid "Virtual Surround 7.1"
+msgstr "Virtuaalinen tilaääni 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "Analoginen mono"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+msgid "Analog Mono (Left)"
+msgstr "Analoginen mono (vasen)"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+msgid "Analog Mono (Right)"
+msgstr "Analoginen mono (oikea)"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "Analoginen stereo"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "Mono"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr "Kuulokkeet"
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+msgid "Speakerphone"
+msgstr "Kaiutinpuhelin"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr "Monikanavainen"
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "Analoginen tilaääni 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "Analoginen tilaääni 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "Analoginen tilaääni 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "Analoginen tilaääni 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "Analoginen tilaääni 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "Analoginen tilaääni 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "Analoginen tilaääni 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "Analoginen tilaääni 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "Analoginen tilaääni 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "Analoginen tilaääni 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "Analoginen tilaääni 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "Digitaalinen stereo (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Digitaalinen tilaääni 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Digitaalinen tilaääni 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Digitaalinen tilaääni 5.1 (IEC958/DTS)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "Digitaalinen stereo (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Digitaalinen tilaääni 5.1 (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr "Juttelu"
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr "Peli"
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "Analoginen mono, molemmat suunnat"
+
+#: src/modules/alsa/alsa-mixer.c:4733
+msgid "Analog Stereo Duplex"
+msgstr "Analoginen stereo, molemmat suunnat"
+
+#: src/modules/alsa/alsa-mixer.c:4736
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "Digitaalinen stereo, molemmat suunnat (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr "Monikanavainen Duplex"
+
+#: src/modules/alsa/alsa-mixer.c:4738
+msgid "Stereo Duplex"
+msgstr "Stereo, molemmat suunnat"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr "Mono Chat + 7.1 Surround"
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+msgid "Off"
+msgstr "Poissa"
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, c-format
+msgid "%s Output"
+msgstr "%s Ulostulo"
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, c-format
+msgid "%s Input"
+msgstr "%s Sisääntulo"
+
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+#, 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 ""
+"ALSA herätti taustaprosessin kirjoittamaan uutta dataa laitteelle, mutta "
+"mitään kirjoitettavaa ei ollut!\n"
+"Tämä on luultavasti ohjelmavirhe ALSA-ajurissa ”%s”. Raportoi tästä "
+"ongelmasta ALSA-kehittäjille. \n"
+"Taustaprosessi herätettiin POLLOUT asetettuna, snd_pcm_avail() palautti "
+"kuitenkin 0 tai jonkin muun arvon, joka on < min_avail."
+
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, 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 ""
+"ALSA herätti taustaprosessin lukemaan uutta dataa laitteelta, mutta mitään "
+"luettavaa ei ollut!\n"
+"Tämä on luultavasti ohjelmavirhe ALSA-ajurissa ”%s”. Raportoi tästä "
+"ongelmasta ALSA-kehittäjille. \n"
+"Taustaprosessi herätettiin POLLIN asetettuna, snd_pcm_avail() palautti "
+"kuitenkin 0 tai jonkin muun arvon, on < min_avail."
+
+#: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_avail() palautti poikkeuksellisen suuren arvon: %lu tavu (%lu ms).\n"
+"Tämä on todennäköisesti ohjelmavirhe ALSA-ajurissa ”%s”. Ilmoita tästä "
+"ongelmasta ALSA-kehittäjille."
+msgstr[1] ""
+"snd_pcm_avail() palautti poikkeuksellisen suuren arvon: %lu tavua (%lu ms).\n"
+"Tämä on todennäköisesti ohjelmavirhe ALSA-ajurissa ”%s”. Ilmoita tästä "
+"ongelmasta ALSA-kehittäjille."
+
+#: src/modules/alsa/alsa-util.c:1249
+#, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() palautti poikkeuksellisen suuren arvon: %li tavu (%s%lu "
+"ms).\n"
+"Tämä on todennäköisesti ohjelmavirhe ALSA-ajurissa ”%s”. Ilmoita tästä "
+"ongelmasta ALSA-kehittäjille."
+msgstr[1] ""
+"snd_pcm_delay() palautti poikkeuksellisen suuren arvon: %li tavua (%s%lu "
+"ms).\n"
+"Tämä on todennäköisesti ohjelmavirhe ALSA-ajurissa ”%s”. Ilmoita tästä "
+"ongelmasta ALSA-kehittäjille."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, 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 ""
+"snd_pcm_avail_delay() palautti poikkeuksellisia arvoja: %lu on vähemmän kuin "
+"saatavissa oleva %lu.\n"
+"Tämä on todennäköisesti ohjelmavirhe ALSA-ajurissa ”%s”. Ilmoita tästä "
+"ongelmasta ALSA-kehittäjille."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() palautti poikkeuksellisen suuren arvon: %lu tavu (%lu "
+"ms).\n"
+"Tämä on todennäköisesti ohjelmavirhe ALSA-ajurissa ”%s”. Ilmoita tästä "
+"ongelmasta ALSA-kehittäjille."
+msgstr[1] ""
+"snd_pcm_mmap_begin() palautti poikkeuksellisen suuren arvon: %lu tavua (%lu "
+"ms).\n"
+"Tämä on todennäköisesti ohjelmavirhe ALSA-ajurissa ”%s”. Ilmoita tästä "
+"ongelmasta ALSA-kehittäjille."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth:n sisääntulo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth ulostulo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Kädet vapaana"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Kuuloke"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Kannettava"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Auto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Hi-Fi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Puhelin"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Korkean äänenlaadun toisto (A2DP Sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Korkean äänenlaadun kaappaus (A2DP Source)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Kuulokkeiden pääyksikkö (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Kuulokkeiden ääniyhdyskäytävä (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Kuulokkeiden pääyksikkö (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Kuulokkeiden ääniyhdyskäytävä (HFP)"
+
+#: src/modules/echo-cancel/module-echo-cancel.c:59
+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> use_master_format=<yes "
+"or no> "
+msgstr ""
+"source_name=<lähteen nimi> source_properties=<lähteen ominaisuudet> "
+"source_master=<suodatettavan lähteen nimi> sink_name=<nielun nimi> "
+"sink_properties=<nielun ominaisuudet> sink_master=<suodatettavan nielun "
+"nimi> Adjust_time=<kuinka usein säädä nopeuksia s-arvoissa <käytettävä "
+"toteutus> aec_args=<AEC-moottorin parametrit> save_aec=<tallenna AEC-tiedot/"
+"tmp> autoloaded=<aseta, jos tätä moduulia ladataan automaattisesti> "
+"use_volume_sharing=<kyllä tai ei> use_master_format=<kyllä tai ei> "
+
+#. add on profile
+#: src/modules/macosx/module-coreaudio-device.c:825
+msgid "On"
+msgstr "Päällä"
+
+#: src/modules/module-allow-passthrough.c:71
+#: src/modules/module-always-sink.c:80
+msgid "Dummy Output"
+msgstr "Valeulostulo"
+
+#: src/modules/module-always-sink.c:34
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr "Pidä aina vähintään yksi nielu ladattuna, vaikka se olisi tyhjä nielu"
+
+#: src/modules/module-always-source.c:35
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr "Pidä aina vähintään yksi lähde ladattuna, vaikka se olisi tyhjä lähde"
+
+#: src/modules/module-equalizer-sink.c:68
+msgid "General Purpose Equalizer"
+msgstr "Yleiskäyttöinen taajuuskorjain"
+
+#: src/modules/module-equalizer-sink.c:72
+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=<nielun nimi> sink_properties=<nielun asetukset> "
+"master=<suodatettavan nielun nimi> format=<näytemuoto> "
+"rate=<näytteenottotaajuus> channels=<kanavien määrä> "
+"channel_map=<kanavakartta> plugin=<ladspa-liitännäisen nimi> label=<ladspa-"
+"liitännäisen nimiö (label)> control=<pilkulla erotettu luettelo "
+"syötteenhallinta-arvoja> "
+
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr "FFT-pohjainen taajuuskorjain %s:lla"
+
+#: src/modules/module-filter-apply.c:47
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr ""
+
+#: src/modules/module-ladspa-sink.c:50
+msgid "Virtual LADSPA sink"
+msgstr "Virtuaalinen LADSPA-nielu"
+
+#: src/modules/module-ladspa-sink.c:54
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"sink_input_properties=<properties for the sink input> master=<name of sink "
+"to filter> 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> autoloaded=<set if this module "
+"is being loaded automatically> "
+msgstr ""
+"sink_name=<nielun nimi> sink_properties=<nielun ominaisuudet> "
+"sink_input_properties=<nielun tulo-ominaisuudet> master=<suodattavan nielun "
+"nimi> sink_master=<suodatettavan nielun nimi> format=<näytemuoto> "
+"korko=<otosnopeus> kanavat=<kanavien lukumäärä> "
+"kanavan_kartta=<tulokanavakartta> laajennus=<ladspa-laajennuksen nimi> "
+"etiketti=<ladspa-laajennuksen tunniste> ohjaus=<pilkulla erotettu luettelo "
+"tulon ohjausarvoista> input_ladspaport_map=<pilkulla erotettu luettelo "
+"syötettyjen LADSPA-porttien nimistä> output_ladspaport_map=<pilkuilla "
+"erotettu luettelo lähtevien LADSPA-porttien nimistä> autoloaded=<aseta, jos "
+"tätä moduulia ladataan automaattisesti> "
+
+#: src/modules/module-null-sink.c:46
+msgid "Clocked NULL sink"
+msgstr "Kellotettu tyhjä nielu"
+
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Tyhjä ulostulo"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+#, c-format
+msgid "Failed to set format: invalid format string %s"
+msgstr "Formaatin asetus epäonnistui: virheellinen formaatti merkkijono %s"
+
+#: src/modules/module-rygel-media-server.c:506
+#: src/modules/module-rygel-media-server.c:544
+#: src/modules/module-rygel-media-server.c:903
+msgid "Output Devices"
+msgstr "Ulostulolaitteet"
+
+#: src/modules/module-rygel-media-server.c:507
+#: src/modules/module-rygel-media-server.c:545
+#: src/modules/module-rygel-media-server.c:904
+msgid "Input Devices"
+msgstr "Sisääntulolaitteet"
+
+#: src/modules/module-rygel-media-server.c:1061
+msgid "Audio on @HOSTNAME@"
+msgstr "Ääni koneella @HOSTNAME@"
+
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "Tunneli %s@%s:ta varten"
+
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+#, c-format
+msgid "Tunnel to %s/%s"
+msgstr "Tunneli %s/%s:een"
+
+#: src/modules/module-virtual-surround-sink.c:50
+msgid "Virtual surround sink"
+msgstr "Virtuaalinen ympäristö-nielu"
+
+=======
 "Käyttäjän määrittämä palvelin osoitteessa %s, joka näyttää olevan "
 "paikallinen. Tutkitaan syvemmälle."
 
@@ -1225,6 +2263,7 @@ msgstr "Tunneli %s/%s:een"
 msgid "Virtual surround sink"
 msgstr "Virtuaalinen ympäristö-nielu"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/module-virtual-surround-sink.c:54
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
@@ -1247,9 +2286,15 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Tuntematon laitemalli"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr "RAOP -vakioprofiili"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
@@ -1458,7 +2503,10 @@ msgstr "Oikea ylä taka"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(virheellinen)"
 
@@ -1519,7 +2567,11 @@ msgstr "ulostulo"
 
 #: src/pulse/direction.c:41
 msgid "bidirectional"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "kaksisuuntainen"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulse/direction.c:43
 msgid "invalid"
@@ -1532,10 +2584,13 @@ 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 ""
+<<<<<<< HEAD
+=======
 "XDG_RUNTIME_DIR (%s) ei ole meidän omistama (uid %d), vaan uid:n %d! (Tämä "
 "voi tapahtua esimerkiksi, jos yrität muodostaa yhteyden ei-pääkäyttäjän "
 "PulseAudio-sovellukseen pääkäyttäjänä natiiviprotokollan kautta. Älä tee "
 "sitä.)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulsecore/core-util.h:97
 msgid "yes"
@@ -1559,18 +2614,29 @@ msgstr "Kohdetiedoston ”%s” avaaminen epäonnistui."
 msgid ""
 "Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
 msgstr ""
+<<<<<<< HEAD
+=======
 "Yritetty avata kohdetiedostoa '%s', '%s.1', '%s.2' ... '%s.%d', mutta "
 "epäonnistuttu."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulsecore/log.c:651
 msgid "Invalid log target."
 msgstr "Virheellinen lokikirjoituksen kohde."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Sisäinen äänentoisto"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Sisäinen äänentoisto"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modeemi"
 
@@ -1818,7 +2884,11 @@ msgstr "Korkkipyyntöpino on tyhjä: poistetaan korkkivirta"
 
 #: src/utils/pacat.c:425
 msgid "Warning: Received more uncork requests than cork requests."
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Varoitus: Vastaanotettu enemmän cork-poistopyyntöjä kuin cork-pyyntöjä."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:450
 #, c-format
@@ -1845,7 +2915,11 @@ msgstr "Monitorin virran asettaminen epäonnistui: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Yhteysvirhe: %s"
@@ -2007,29 +3081,42 @@ msgstr ""
 
 #: src/utils/pacat.c:793
 msgid "Play back encoded audio files on a PulseAudio sound server."
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Toista koodattuja äänitiedostoja PulseAudio-äänipalvelimella."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:797
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to a file."
 msgstr ""
+<<<<<<< HEAD
+=======
 "Kaappaa äänidataa PulseAudio-äänipalvelimelta ja kirjoita se tiedostoon."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:801
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to STDOUT or "
 "the specified file."
 msgstr ""
+<<<<<<< HEAD
+=======
 "Kaappaa äänidataa PulseAudio-äänipalvelimelta ja kirjoita se STDOUTiin tai "
 "määritettyyn tiedostoon."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:805
 msgid ""
 "Play back audio data from STDIN or the specified file on a PulseAudio sound "
 "server."
 msgstr ""
+<<<<<<< HEAD
+=======
 "Toista äänidataa STDINistä tai määritetystä tiedostosta PulseAudio-"
 "äänipalvelimella."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:819
 #, c-format
@@ -2042,7 +3129,11 @@ msgstr ""
 "Käännetty libpulsen versiolle %s\n"
 "Linkitetty libpulsen versiolle %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Virheellinen asiakasohjelman nimi ”%s”"
@@ -2079,7 +3170,11 @@ msgstr "Tuntematon tiedostomuoto %s."
 
 #: src/utils/pacat.c:1000
 msgid "Failed to parse the argument for --monitor-stream"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Argumentin --monitor-stream jäsentäminen epäonnistui"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:1011
 msgid "Invalid sample specification"
@@ -2114,7 +3209,11 @@ msgid ""
 msgstr ""
 "Varoitus: tiedostosta luettava näytemääritys korvaa annetun määrityksen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Näytemäärityksen selvittäminen tiedostosta epäonnistui."
 
@@ -2148,7 +3247,11 @@ msgstr "toisto"
 msgid "Failed to set media name."
 msgstr "Median nimeäminen epäonnistui."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() epäonnistui."
 
@@ -2156,11 +3259,19 @@ msgstr "pa_mainloop_new() epäonnistui."
 msgid "io_new() failed."
 msgstr "io_new() epäonnistui."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() epäonnistui."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() epäonnistui."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() epäonnistui: %s"
@@ -2169,6 +3280,23 @@ msgstr "pa_context_connect() epäonnistui: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_new() epäonnistui."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() epäonnistui."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NIMI [ARGUMENTIT...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NIMI|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() epäonnistui."
@@ -2184,6 +3312,7 @@ msgstr "NIMI|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NIMI"
 
@@ -2195,7 +3324,11 @@ msgstr "NIMI|#N VOLUUMI"
 msgid "#N VOLUME"
 msgstr "#N VOLUUMI"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NIMI|#N 1|0"
 
@@ -2209,7 +3342,11 @@ msgstr "NIMI|#N AVAIN=ARVO"
 
 #: src/utils/pacmd.c:59
 msgid "#N KEY=VALUE"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "#N AVAIN=ARVO"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:61
 msgid "#N"
@@ -2231,14 +3368,49 @@ msgstr "POLKU"
 msgid "FILENAME SINK|#N"
 msgstr "TIEDOSTONIMI NIELU|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+msgid "#N SINK|SOURCE"
+msgstr ""
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
 msgid "#N SINK|SOURCE"
 msgstr "#N SINKKI|LÄHDE"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:71 src/utils/pacmd.c:77 src/utils/pacmd.c:78
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KORTTI PROFIILI"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NIMI|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr ""
+
+#: src/utils/pacmd.c:75
+msgid "TARGET"
+msgstr ""
+
+#: src/utils/pacmd.c:76
+msgid "NUMERIC-LEVEL"
+msgstr ""
+
+#: src/utils/pacmd.c:79
+msgid "FRAMES"
+msgstr ""
+
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KORTTI PROFIILI"
@@ -2266,6 +3438,7 @@ msgstr "ÄÄNIRUUDUT"
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "VASTAAJAN VIESTI [MESSAGE_PARAMETERS]"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:82
 #, c-format
@@ -2310,11 +3483,19 @@ msgstr "connect(): %s"
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
 msgstr "PulseAudio-taustaprosessin lopettaminen epäonnistui."
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:181
 msgid "Daemon not responding."
 msgstr "Taustaprosessi ei vastaa."
 
+=======
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "Taustaprosessi ei vastaa."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
@@ -2324,6 +3505,15 @@ msgstr "write(): %s"
 #, c-format
 msgid "poll(): %s"
 msgstr "poll(): %s"
+<<<<<<< HEAD
+
+#: src/utils/pacmd.c:280 src/utils/pacmd.c:300
+#, c-format
+msgid "read(): %s"
+msgstr "read(): %s"
+
+#: src/utils/pactl.c:175
+=======
 
 #: src/utils/pacmd.c:280 src/utils/pacmd.c:300
 #, c-format
@@ -2331,18 +3521,27 @@ msgid "read(): %s"
 msgstr "read(): %s"
 
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Tilastojen selvittäminen epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Nyt käytössä: %u lohko sisältäen yhteensä %s tavua.\n"
 msgstr[1] "Nyt käytössä: %u lohkoa sisältäen yhteensä %s tavua.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2350,22 +3549,39 @@ msgid_plural ""
 msgstr[0] "Koko käyttöaikana varattu: %u lohko sisältäen yhteensä %s tavua.\n"
 msgstr[1] "Koko käyttöaikana varattu: %u lohkoa sisältäen yhteensä %s tavua.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Näytevälimuistin koko: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Palvelintietojen selvittäminen epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2382,7 +3598,11 @@ msgstr ""
 "Asiakasindeksi: %u\n"
 "Laattojen koko: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2405,6 +3625,74 @@ msgstr ""
 "Oletuslähde: %s\n"
 "Eväste: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "saatavilla"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "Ei käytettävissä"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Linja"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Verkko"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analoginen"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "saatavuus tuntematon"
@@ -2471,11 +3759,16 @@ msgstr "Analoginen"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Nielun tietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2514,11 +3807,27 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortit:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2529,22 +3838,36 @@ msgid ", availability group: "
 msgstr ", saatavuusryhmä: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktiivinen portti: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormaatit:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Lähteen tietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2583,6 +3906,17 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "-"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2592,11 +3926,16 @@ msgid "n/a"
 msgstr "-"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Moduulin tietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2613,12 +3952,20 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Asiakkaan tietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2633,12 +3980,20 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Kortin tietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2655,11 +4010,23 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfiilit:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1240
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
@@ -2667,24 +4034,43 @@ msgstr ""
 "\t\t%s: %s (nielut: %u, lähteet: %u, prioriteetti: %u, käytettävissä: %s)\n"
 
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktiivinen profiili: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (tyyppi: %s, prioriteetti: %u, latenssipoikkeama: %<PRId64> "
 "usec%s%s, %s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:684
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 "\t\t\tOminaisuudet:\n"
 "\t\t\t\t%s\n"
 
@@ -2694,11 +4080,16 @@ msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tOsa profiilista (profiileista): %s"
 
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Nielun sisääntulon tietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2737,12 +4128,20 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Lähteen ulostulon tietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2781,12 +4180,20 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Näytetietojen nouto epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2815,11 +4222,41 @@ msgstr ""
 "\tOminaisuudet:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Epäonnistuminen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, c-format
+msgid "Send message failed: %s"
+msgstr "Viestin lähetys epäonnistui: %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2845,11 +4282,16 @@ msgstr ""
 "listakäsittelijöiden viestivastaustaulukon elementti %d ei ole JSON-objekti"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Modulin purku epäonnistui: Moduuli %s ei ole ladattu"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2858,6 +4300,11 @@ msgid_plural ""
 "Failed to set volume: You tried to set volumes for %d channels, whereas "
 "channel(s) supported = %d\n"
 msgstr[0] ""
+<<<<<<< HEAD
+msgstr[1] ""
+
+#: src/utils/pactl.c:1340
+=======
 "Äänenvoimakkuuden asettaminen epäonnistui: Yritit asettaa äänenvoimakkuutta "
 "%d kanavalle, kun taas tuetut kanavat = %d\n"
 msgstr[1] ""
@@ -2865,10 +4312,42 @@ msgstr[1] ""
 "%d kanaville, kun taas tuetut kanavat = %d\n"
 
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Näytteen lähettäminen epäonnistui: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Ennenaikainen tiedoston päättyminen"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "uusi"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "vaihda"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "poista"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "tuntematon"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "nielu"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "lähde"
+
+#: src/utils/pactl.c:1400
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Ennenaikainen tiedoston päättyminen"
@@ -2898,9 +4377,25 @@ msgid "source"
 msgstr "lähde"
 
 #: src/utils/pactl.c:2167
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "sink-input"
 msgstr "nielun sisääntulo"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "lähde-ulostulo"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "moduuli"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "asiakas"
+
+#: src/utils/pactl.c:1412
+=======
 #: src/utils/pactl.c:2170
 msgid "source-output"
 msgstr "lähde-ulostulo"
@@ -2914,9 +4409,21 @@ msgid "client"
 msgstr "asiakas"
 
 #: src/utils/pactl.c:2179
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "sample-cache"
 msgstr "näyte-välimuisti"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "palvelin"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2182
 msgid "server"
 msgstr "palvelin"
@@ -2926,10 +4433,78 @@ msgid "card"
 msgstr "kortti"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Tapahtuma '%s' %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Saatiin SIGINT, lopetetaan."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Virheellinen äänenvoimakkuuden määritys"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Virheellinen äänenvoimakkuuden määritys.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Virheellinen äänenvoimakkuuden määritys.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[vaihtoehdot]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYYPPI]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "TIEDOSTONIMI [NIMI]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NIMI|#N VOLUUMI [VOLUUMI ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N TALTIO [TALTIO ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NIMI|#N 1|0|vaihda"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|vaihda"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMAATIT"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Saatiin SIGINT, lopetetaan."
@@ -2995,6 +4570,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMAATIT"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3005,7 +4581,11 @@ msgstr ""
 "Erikoisnimiä @DEFAULT_SINK@, @DEFAULT_SOURCE@ ja @DEFAULT_MONITOR@\n"
 "voidaan käyttää oletusnielun, lähteen ja näytön määrittämiseen.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3022,13 +4602,21 @@ msgstr ""
 "\n"
 "  -h, --help                            Näytä tämä ohje\n"
 "      --version                         Näytä versio\n"
+<<<<<<< HEAD
+"      \n"
+=======
 "\n"
 "  -f, --format=FORMAT Tulosteen muoto. Joko \"normaali\" tai \"json\"   \n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=PALVELIN                 Sen palvelimen nimi, johon "
 "yhdistetään\n"
 "  -n, --client-name=NIMI                  Asiakkaan nimi palvelimella\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3039,16 +4627,59 @@ msgstr ""
 "Käännetty libpulsen versiolle %s\n"
 "Linkitetty libpulsen versiolle %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Virheellinen muotoarvo ”%s”"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Määritä tyhjäksi tai jokin seuraavista: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Anna ladattava näytetiedosto"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Äänitiedoston avaaminen epäonnistui."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Varoitus: näytemäärityksen selvitys tiedostosta epäonnistui."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Soitettavan näytteen nimi on annettava"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Poistettavan näytteen nimi on annettava"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Nielun syöteindeksi ja nielu on annettava"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Lähteen ulostuloindeksi ja lähde on annettava"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Moduulin nimi ja argumentit on annettava."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Moduulin indeksi tai nimi on annettava"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Anna ladattava näytetiedosto"
@@ -3086,20 +4717,86 @@ msgid "You have to specify a module index or name"
 msgstr "Moduulin indeksi tai nimi on annettava"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "Ei voi antaa enempää kuin yhden nielun. Totuusarvo on annettava."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Virheellinen äänenvaimennuksen määritys."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Virheellinen äänenvaimennuksen määritys."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "Ei voi antaa enempää kuin yhden lähteen. Totuusarvo on annettava."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Kortin nimi/indeksi ja profiilin nimi on annettava"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Nielun nimi/indeksi ja portin nimi on annettava"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Nielun nimi on annettava"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Lähteen nimi/indeksi ja portin nimi on annettava"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Lähteen nimi on annettava"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Nielun nimi on annettava"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Nielun nimi/indeksi ja portin nimi on annettava"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Lähteen nimi on annettava"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Lähteen nimi/indeksi ja äänenvoimakkuus on annettava"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Nielun syöteindeksi ja äänenvoimakkuus on annettava"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Virheellinen nielun syöteindeksi"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Lähteen ulostuloindeksi ja äänenvoimakkuus on annettava"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Virheellinen lähteen ulostuloindeksi"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Kortin nimi/indeksi ja profiilin nimi on annettava"
@@ -3153,36 +4850,58 @@ msgid "Invalid source output index"
 msgstr "Virheellinen lähteen ulostuloindeksi"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Nielun nimi/indeksi ja vaimennuksen toiminto (0, 1, tai \"vaihda\") on "
 "annettava"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Ei kelvollinen mykistysmääritys"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Ei kelvollinen mykistysmääritys"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Lähteen nimi/indeksi ja vaimennuksen toiminto (0, 1, tai \"vaihda\") on "
 "annettava"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Nielun syöteindeksi ja vaimennuksen toiminto (0, 1, tai \"vaihda\") on "
 "annettava"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Virheellinen nielun syöteindeksin määritys"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Virheellinen nielun syöteindeksin määritys"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3190,6 +4909,17 @@ msgstr ""
 "Lähteen ulostuloindeksi ja vaimennuksen toiminto (0, 1, tai \"vaihda\") on "
 "annettava"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Ei kelvollinen lähteen ulostulon indeksin määritys"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "Vähintään objektin polku ja viestin nimi on annettava"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Ei kelvollinen lähteen ulostulon indeksin määritys"
@@ -3199,14 +4929,20 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Vähintään objektin polku ja viestin nimi on annettava"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Ylimääräisiä argumentteja annettu, ne jätetään huomiotta. Huomaa, että "
 "kaikki viestiparametrit on annettava yhtenä merkkijonona."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3214,6 +4950,17 @@ msgstr ""
 "Nielun indeksi ja puolipilkulla eroteltu lista tuetuista formaateista on "
 "annettava"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "Kortin nimi/indeksi ja portin nimi ja viivästysasetus on annettava"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Kortin nimi/indeksi ja portin nimi ja viivästysasetus on annettava"
@@ -3223,6 +4970,7 @@ msgid "Could not parse latency offset"
 msgstr "Latenssipoikkeamaa ei voitu jäsentää"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Mitään kelvollista komentoa ei annettu."
 
diff --git a/po/fr.po b/po/fr.po
index c71321dbd..1916c0b82 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,9 +16,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2020-12-13 17:35+0000\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2023-03-19 17:20+0000\n"
 "Last-Translator: grimst <grimaitres@gmail.com>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: French <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/fr/>\n"
 "Language: fr\n"
@@ -26,10 +32,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.3.2\n"
+
+#: src/daemon/cmdline.c:113
+#, fuzzy, c-format
+=======
 "X-Generator: Weblate 4.15.2\n"
 
 #: src/daemon/cmdline.c:113
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "\n"
@@ -114,8 +127,13 @@ msgstr ""
 "      --start                           Lancer le démon s’il n’est pas en "
 "cours d’exécution\n"
 "  -k  --kill                            Tuer un démon en cours d’exécution\n"
+<<<<<<< HEAD
+"      --check                           Rechercher un démon en cours "
+"d’exécution (retourne uniquement un code de sortie)\n"
+=======
 "      --check                           Rechercher un démon en cours d’"
 "exécution (retourne uniquement un code de sortie)\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\n"
 "OPTIONS :\n"
 "      --system[=BOOL]                   Exécuter en tant qu’instance "
@@ -136,8 +154,13 @@ msgstr ""
 "déchargement de modules\n"
 "                                        requis par l’utilisateur de module "
 "après le lancement\n"
+<<<<<<< HEAD
+"      --disallow-exit[=BOOL]            Interdire la sortie requise par "
+"l’utilisateur\n"
+=======
 "      --disallow-exit[=BOOL]            Interdire la sortie requise par l’"
 "utilisateur\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "      --exit-idle-time=SECS             Quitter le démon lorsqu’inactif et "
 "que cette\n"
 "                                        période s’est écoulée\n"
@@ -193,7 +216,10 @@ msgid "--fail expects boolean argument"
 msgstr "--fail requiert un paramètre booléen"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+=======
 #, fuzzy
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
@@ -503,6 +529,31 @@ msgstr ""
 "plus précise en cours."
 
 #: src/daemon/main.c:878
+<<<<<<< HEAD
+#, fuzzy
+msgid "Running in system mode, but --disallow-exit not set."
+msgstr ""
+"Le démon s’exécute en mode système, mais --disallow-exit n’est pas défini !"
+
+#: src/daemon/main.c:881
+#, fuzzy
+msgid "Running in system mode, but --disallow-module-loading not set."
+msgstr ""
+"Le démon s’exécute en mode système, mais --disallow-module-loading n’est pas "
+"défini !"
+
+#: src/daemon/main.c:884
+#, fuzzy
+msgid "Running in system mode, forcibly disabling SHM mode."
+msgstr "Le démon s’exécute en mode système, désactivation forcée du mode SHM !"
+
+#: src/daemon/main.c:889
+#, fuzzy
+msgid "Running in system mode, forcibly disabling exit idle time."
+msgstr ""
+"Le démon s’exécute en mode système, désactivation forcée de la fermeture "
+"après délai d’inactivité !"
+=======
 msgid "Running in system mode, but --disallow-exit not set."
 msgstr "Exécution en mode système, mais --disallow-exit n’est pas défini."
 
@@ -520,6 +571,7 @@ msgid "Running in system mode, forcibly disabling exit idle time."
 msgstr ""
 "Exécution en mode système, désactivation forcée de la fermeture après délai "
 "d’inactivité."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:922
 msgid "Failed to acquire stdio."
@@ -554,6 +606,10 @@ msgid "Failed to get machine ID"
 msgstr "Échec lors de l’obtention de l’ID de la machine"
 
 #: src/daemon/main.c:1145
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "OK, so you are running PA in system mode. Please make sure that you actually "
 "do want to do that.\n"
@@ -576,6 +632,19 @@ msgid "pa_core_new() failed."
 msgstr "Échec de pa_core_new()."
 
 #: src/daemon/main.c:1268
+<<<<<<< HEAD
+#, fuzzy
+msgid "command line arguments"
+msgstr "Trop de paramètres."
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+=======
 msgid "command line arguments"
 msgstr "paramètres de la ligne de commande"
 
@@ -586,6 +655,7 @@ msgid ""
 "Source of commands: %s"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr "Démarrage du démon sans aucun module chargé : refus de fonctionner."
@@ -619,7 +689,11 @@ msgid "Line In"
 msgstr "Entrée ligne"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Microphone"
 
@@ -640,12 +714,20 @@ msgid "Internal Microphone"
 msgstr "Microphone interne"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Vidéo"
 
@@ -682,12 +764,20 @@ msgid "No Bass Boost"
 msgstr "Pas de booster de basses"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Haut-parleur"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Casque audio"
 
@@ -711,12 +801,21 @@ msgstr "Sortie analogique"
 #, fuzzy
 msgid "Headphones 2"
 msgstr "Casque audio"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:2809
 #, fuzzy
 msgid "Headphones Mono Output"
 msgstr "Sortie mono analogique"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:2809
+#, fuzzy
+msgid "Headphones Mono Output"
+msgstr "Sortie mono analogique"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:2810
 msgid "Line Out"
 msgstr "Sortie ligne"
@@ -755,6 +854,7 @@ msgstr "Multicanal"
 #, fuzzy
 msgid "Game Output"
 msgstr "Sortie %s"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
 #, fuzzy
@@ -771,6 +871,24 @@ msgstr "Entrée %s"
 msgid "Virtual Surround 7.1"
 msgstr "Destination surround virtuelle"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "Sortie %s"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "Entrée %s"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Destination surround virtuelle"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Mono analogique"
@@ -805,7 +923,11 @@ msgid "Stereo"
 msgstr "Stéréo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Casque"
 
@@ -921,7 +1043,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Éteint"
 
@@ -935,7 +1061,11 @@ msgstr "Sortie %s"
 msgid "%s Input"
 msgstr "Entrée %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -952,7 +1082,11 @@ msgstr ""
 "Nous avons été réveillés avec POLLOUT actif, cependant un snd_pcm_avail() "
 "ultérieur a retourné 0 ou une autre valeur < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -982,15 +1116,26 @@ msgid_plural ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
+<<<<<<< HEAD
+=======
 "snd_pcm_avail() a retourné une valeur qui est exceptionnellement large : %lu "
 "octets (%lu ms).\n"
 "Il s’agit très probablement d’un bogue dans le pilote ALSA « %s ». Veuillez "
 "rapporter ce problème aux développeurs d’ALSA."
 msgstr[1] ""
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "snd_pcm_avail() a retourné une valeur qui est exceptionnellement large : %lu "
 "octets (%lu ms).\n"
 "Il s’agit très probablement d’un bogue dans le pilote ALSA « %s ». Veuillez "
 "rapporter ce problème aux développeurs d’ALSA."
+<<<<<<< HEAD
+msgstr[1] ""
+"snd_pcm_avail() a retourné une valeur qui est exceptionnellement large : %lu "
+"octets (%lu ms).\n"
+"Il s’agit très probablement d’un bogue dans le pilote ALSA « %s ». Veuillez "
+"rapporter ce problème aux développeurs d’ALSA."
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-util.c:1249
 #, fuzzy, c-format
@@ -1005,15 +1150,26 @@ msgid_plural ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
+<<<<<<< HEAD
 "snd_pcm_delay() a retourné une valeur qui est exceptionnellement large : %li "
 "octets (%s%lu ms).\n"
 "Il s’agit très probablement d’un bogue dans le pilote ALSA « %s ». Veuillez "
 "rapporter ce problème aux développeurs d’ALSA."
 msgstr[1] ""
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "snd_pcm_delay() a retourné une valeur qui est exceptionnellement large : %li "
 "octets (%s%lu ms).\n"
 "Il s’agit très probablement d’un bogue dans le pilote ALSA « %s ». Veuillez "
 "rapporter ce problème aux développeurs d’ALSA."
+<<<<<<< HEAD
+=======
+msgstr[1] ""
+"snd_pcm_delay() a retourné une valeur qui est exceptionnellement large : %li "
+"octets (%s%lu ms).\n"
+"Il s’agit très probablement d’un bogue dans le pilote ALSA « %s ». Veuillez "
+"rapporter ce problème aux développeurs d’ALSA."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-util.c:1296
 #, c-format
@@ -1051,6 +1207,52 @@ msgstr[1] ""
 "Il s’agit très probablement d’un bogue dans le pilote ALSA « %s ». Veuillez "
 "rapporter ce problème aux développeurs d’ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Entrée Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Sortie Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Mains-libres"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Écouteurs"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portable"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Voiture"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Téléphone"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Lecture haute fidélité (A2DP Sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Capture haute fidélité (A2DP Source)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1095,21 +1297,34 @@ msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Capture haute fidélité (A2DP Source)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2066
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Head Unit (HSP)"
 msgstr "Unité centrale du casque (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2079
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Audio Gateway (HSP)"
 msgstr "Passerelle Audio du casque (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2092
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Head Unit (HFP)"
 msgstr "Unité centrale du casque (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Passerelle Audio du casque (HSP/HFP)"
@@ -1176,8 +1391,13 @@ msgstr ""
 "autoloaded=<définir si ce module est chargé automatiquement> "
 "use_volume_sharing=<oui ou non> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1214,11 +1434,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Horloge de la destination vide"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Sortie vide"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Sortie vide"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Impossible de définir le format : format de la chaîne %s invalide"
@@ -1241,14 +1469,24 @@ msgstr "Audio sur @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunnel pour %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunnel vers %s/%s"
@@ -1279,7 +1517,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Code d’erreur inconnu"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1490,7 +1732,10 @@ msgstr "Arrière droit haut"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(invalide)"
 
@@ -1598,11 +1843,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Cible du journal non valide."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Audio interne"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Audio interne"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1850,6 +2103,10 @@ msgid "Cork request stack is empty: uncorking stream"
 msgstr "La pile de requêtes de bouchons est vide : débouchonnage du flux"
 
 #: src/utils/pacat.c:425
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Received more uncork requests than cork requests."
 msgstr ""
 "Avertissement : il a été reçu davantage de requêtes de débouchonnage que de "
@@ -1880,7 +2137,11 @@ msgstr "impossible de définir le flux du moniteur : %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Échec de pa_stream_connect_record() : %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Échec lors de la connexion : %s"
@@ -2061,6 +2322,7 @@ msgstr ""
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to a file."
 msgstr ""
+<<<<<<< HEAD
 
 #: src/utils/pacat.c:801
 msgid ""
@@ -2074,6 +2336,21 @@ msgid ""
 "server."
 msgstr ""
 
+=======
+
+#: src/utils/pacat.c:801
+msgid ""
+"Capture audio data from a PulseAudio sound server and write it to STDOUT or "
+"the specified file."
+msgstr ""
+
+#: src/utils/pacat.c:805
+msgid ""
+"Play back audio data from STDIN or the specified file on a PulseAudio sound "
+"server."
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:819
 #, c-format
 msgid ""
@@ -2085,7 +2362,11 @@ msgstr ""
 "Compilé avec libpulse %s\n"
 "Lié avec libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nom du client invalide « %s »"
@@ -2159,7 +2440,11 @@ msgstr ""
 "Avertissement : les spécifications de l’échantillon spécifié seront écrasées "
 "par celles du fichier."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 "Échec lors de l’obtention des informations de l’échantillon du fichier."
@@ -2199,7 +2484,11 @@ msgstr "lecture"
 msgid "Failed to set media name."
 msgstr "Impossible de définir le nom du support."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Échec de pa_mainloop_new()."
 
@@ -2207,11 +2496,19 @@ msgstr "Échec de pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Échec de io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Échec de pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Échec de pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Échec de pa_context_connect() : %s"
@@ -2220,6 +2517,23 @@ msgstr "Échec de pa_context_connect() : %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Échec de pa_context_rttime_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Échec de pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAME [ARGS ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAME|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Échec de pa_mainloop_run()."
@@ -2235,6 +2549,7 @@ msgstr "NAME|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAME"
 
@@ -2246,7 +2561,11 @@ msgstr "NAME|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAME|#N 1|0"
 
@@ -2282,7 +2601,11 @@ msgstr "PATHNAME"
 msgid "FILENAME SINK|#N"
 msgstr "FILENAME SINK|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N SINK|SOURCE"
 
@@ -2290,6 +2613,17 @@ msgstr "#N SINK|SOURCE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "CARD PROFILE"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAME|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "CARD PROFILE"
@@ -2299,6 +2633,7 @@ msgid "NAME|#N PORT"
 msgstr "NAME|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "CARD-NAME|CARD-#N PORT OFFSET"
 
@@ -2315,7 +2650,11 @@ msgstr "NUMERIC LEVEL"
 msgid "FRAMES"
 msgstr "FRAMES"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2382,19 +2721,31 @@ msgstr "poll() : %s"
 msgid "read(): %s"
 msgstr "read() : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Échec lors de l’obtention des statistiques : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "En cours d’utilisation : %u blocs contenant au total %s octets.\n"
 msgstr[1] "En cours d’utilisation : %u blocs contenant au total %s octets.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2406,11 +2757,28 @@ msgstr[1] ""
 "Alloué pendant l’ensemble de la durée d’exécution : %u blocs contenant au "
 "total %s octets.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Taille du cache de l’échantillon : %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+#, c-format
+msgid "Failed to get server information: %s"
+msgstr "Échec lors de l’obtention des informations du serveur : %s"
+
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
 #, c-format
 msgid "Failed to get server information: %s"
@@ -2422,6 +2790,7 @@ msgid "%s\n"
 msgstr "%s %s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2438,7 +2807,11 @@ msgstr ""
 "Index client : %u\n"
 "Tile Size : %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2461,6 +2834,21 @@ msgstr ""
 "Source par défaut : %s\n"
 "Cookie : %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2474,28 +2862,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "inconnu(e)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Entrée ligne"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Casque"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2517,26 +2945,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Entrée Bluetooth"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Mono analogique"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Échec lors de l’obtention des informations sur la destination : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2574,6 +3020,24 @@ msgstr ""
 "\tMarqueurs : %s%s%s%s%s%s%s\n"
 "\tPropriétés :\n"
 "\t\t%s\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+#, c-format
+msgid "\tPorts:\n"
+msgstr "\tPorts :\n"
+
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
 #, c-format
@@ -2590,22 +3054,36 @@ msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPort actif : %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormats :\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Échec lors de l’obtention des informations sur la source : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2644,6 +3122,17 @@ msgstr ""
 "\tPropriétés :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/d"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2653,11 +3142,16 @@ msgid "n/a"
 msgstr "n/d"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Échec lors de l’obtention des informations du module : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2674,12 +3168,20 @@ msgstr ""
 "\tPropriétés : \n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Échec lors de l’obtention des informations du client : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2694,12 +3196,20 @@ msgstr ""
 "\tPropriétés :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Impossible d’obtenir des informations sur la carte : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2716,6 +3226,24 @@ msgstr ""
 "\tPropriétés :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+#, c-format
+msgid "\tProfiles:\n"
+msgstr "\tProfils :\n"
+
+#: src/utils/pactl.c:659
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:664
+#, c-format
+msgid "\tActive Profile: %s\n"
+msgstr "\tProfil actif : %s\n"
+
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1238
 #, c-format
 msgid "\tProfiles:\n"
@@ -2732,12 +3260,17 @@ msgid "\tActive Profile: %s\n"
 msgstr "\tProfil actif : %s\n"
 
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2746,18 +3279,30 @@ msgstr ""
 "\t\t\tPropriétés :\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tPartie du(des) profil(s) : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 "Échec lors de l’obtention des informations de l’entrée de la destination : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2796,13 +3341,21 @@ msgstr ""
 "\tPropriétés :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 "Échec lors de l’obtention des informations de la sortie de la source : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2841,12 +3394,20 @@ msgstr ""
 "\tPropriétés :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Échec lors de l’obtention des informations de l’échantillon : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2875,21 +3436,44 @@ msgstr ""
 "\tPropriétés :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Échec : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "Échec de read() : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2899,16 +3483,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Impossible de décharger le module : module %s non chargé"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2923,11 +3516,74 @@ msgstr[1] ""
 "impossible de définir le volume : vous avex tenté de définir les volumes de "
 "%d canaux, tandis que channel/s prenait en charge = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Échec lors de l’envoi de l’échantillon : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Fin prématurée du fichier"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nouveau"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "changement"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "supprimer"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "inconnu(e)"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "destination"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "source"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "sink-input"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "source-output"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "module"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "client"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "sample-cache"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "serveur"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "carte"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Fin prématurée du fichier"
@@ -2985,10 +3641,78 @@ msgid "card"
 msgstr "carte"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Événement « %s » sur %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT reçu, fermeture."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Spécification de volume invalide"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Le volume est au-delà de la plage admissible.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Nombre de spécifications du volume invalide.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Spécification du volume incohérente.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[options]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYPE]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "FILENAME [NAME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAME [SINK]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAME|#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAME|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATS"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT reçu, fermeture."
@@ -3054,6 +3778,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATS"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3065,15 +3790,23 @@ msgstr ""
 "peuvent être utilisés pour indiquer la destination, la source, et le "
 "moniteur par défaut.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -n, --client-name=NAME                How to call this client on the "
@@ -3088,7 +3821,11 @@ msgstr ""
 "  -n, --client-name=NAME                Comment appeler ce client sur le "
 "serveur\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3099,16 +3836,31 @@ msgstr ""
 "Compilé avec libpulse %s\n"
 "Lié avec libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Nom du flux invalide « %s »"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Ne rien indiquer, ou l’un de : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Veuillez indiquer un fichier d’échantillon à charger"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Échec lors de l’ouverture du fichier audio."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Veuillez indiquer un fichier d’échantillon à charger"
@@ -3118,11 +3870,23 @@ msgid "Failed to open sound file."
 msgstr "Échec lors de l’ouverture du fichier audio."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Avertissement : Échec lors de l’obtention des spécifications de "
 "l’échantillon du fichier."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Vous devez indiquer un nom d’échantillon à lire"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Vous devez indiquer un nom d’échantillon à supprimer"
+
+#: src/utils/pactl.c:2032
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Vous devez indiquer un nom d’échantillon à lire"
@@ -3132,10 +3896,26 @@ msgid "You have to specify a sample name to remove"
 msgstr "Vous devez indiquer un nom d’échantillon à supprimer"
 
 #: src/utils/pactl.c:2844
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink input index and a sink"
 msgstr ""
 "Vous devez indiquer un index d’entrée de destination et une destination"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Vous devez indiquer un index de sortie de source et une source"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Vous devez indiquer un nom de module et des paramètres."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Vous devez indiquer un index ou nom de module"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2854
 msgid "You have to specify a source output index and a source"
 msgstr "Vous devez indiquer un index de sortie de source et une source"
@@ -3149,17 +3929,26 @@ msgid "You have to specify a module index or name"
 msgstr "Vous devez indiquer un index ou nom de module"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Vous ne pouvez pas indiquer plus d’une destination. Vous devez indiquer une "
 "valeur booléenne."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Spécification de suspension invalide."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Spécification de suspension invalide."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3167,6 +3956,29 @@ msgstr ""
 "Vous ne pouvez pas indiquer plus d’une source. Vous devez indiquer une "
 "valeur booléenne."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Vous devez indiquer un nom/un index de carte et un nom de profil"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Vous devez indiquer un nom/un index de destination et un nom de port"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Vous devez indiquer un nom de destination"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Vous devez indiquer un nom/un index de source et un nom de port"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Vous devez indiquer un nom de source"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Vous devez indiquer un nom/un index de carte et un nom de profil"
@@ -3188,19 +4000,51 @@ msgid "You have to specify a source name"
 msgstr "Vous devez indiquer un nom de source"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Vous devez indiquer un nom de destination"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Vous devez indiquer un nom/un index de destination et un volume"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Vous devez indiquer un nom/un index de destination et un volume"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Vous devez indiquer un nom de source"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Vous devez indiquer un nom/un index de source et un volume"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Vous devez indiquer un index d’entrée de destination et un volume"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Index invalide d’entrée de la destination"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Vous devez indiquer un index de sortie de source et un volume"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Index de sortie de source invalide"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Vous devez indiquer un nom/un index de source et un volume"
@@ -3222,56 +4066,94 @@ msgid "Invalid source output index"
 msgstr "Index de sortie de source invalide"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Vous devez indiquer un nom/un index de destination et un booléen muet"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Spécification de sourdine invalide"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Spécification de sourdine invalide"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Vous devez indiquer un nom/un index de source et un booléen muet"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Vous devez indiquer un index d’entrée de destination et un booléen muet"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Spécification d’index d’entrée de la destination invalide"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Spécification d’index d’entrée de la destination invalide"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "Vous devez indiquer un index de sortie de source et un booléen muet"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Spécification d’index de sortie de source invalide"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Spécification d’index de sortie de source invalide"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Vous devez indiquer un nom/un index de destination et un nom de port"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3279,17 +4161,29 @@ msgstr ""
 "Vous devez indiquer un index de destination et une liste des formats pris en "
 "charge séparée par des points-virgules"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Vous devez indiquer un nom ou index carte, un nom de port et un décalage de "
 "latence"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Impossible d’analyser le décalage de la latence"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Impossible d’analyser le décalage de la latence"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Aucune commande valide indiquée."
 
diff --git a/po/gl.po b/po/gl.po
index e3a53673d..da8120d38 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,11 +11,18 @@ msgstr ""
 "Project-Id-Version: PulseAudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2019-02-20 01:36+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
+"Language-Team: Galician\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2023-04-14 18:20+0000\n"
 "Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/gl/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -567,8 +574,14 @@ msgid "pa_core_new() failed."
 msgstr "Produciuse un fallo en pa_core_new()."
 
 #: src/daemon/main.c:1268
+<<<<<<< HEAD
+#, fuzzy
+msgid "command line arguments"
+msgstr "Demasiados argumentos."
+=======
 msgid "command line arguments"
 msgstr "argumentos de liña de ordes"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:1275
 #, c-format
@@ -576,8 +589,11 @@ msgid ""
 "Failed to initialize daemon due to errors while executing startup commands. "
 "Source of commands: %s"
 msgstr ""
+<<<<<<< HEAD
+=======
 "Produciuse un fallo ao inicializar o daemon debido a que se produciron erros "
 "durante a execución de ordes de inicio. A orixe das ordes é: %s"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
@@ -613,7 +629,11 @@ msgid "Line In"
 msgstr "Liña de entrada"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Micrófono"
 
@@ -634,12 +654,20 @@ msgid "Internal Microphone"
 msgstr "Micrófono interno"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Vídeo"
 
@@ -676,12 +704,20 @@ msgid "No Bass Boost"
 msgstr "Sen enfatizador baixo"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Altofalante"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Auriculares"
 
@@ -702,8 +738,14 @@ msgid "Analog Output"
 msgstr "Saída analóxica"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Auriculares"
+=======
 msgid "Headphones 2"
 msgstr "Auriculares 2"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2809
 msgid "Headphones Mono Output"
@@ -750,24 +792,46 @@ msgid "Chat Output"
 msgstr "Saída do chat"
 
 #: src/modules/alsa/alsa-mixer.c:2821
+<<<<<<< HEAD
+#, fuzzy
+msgid "Chat Input"
+msgstr "Saída do chat"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Sumideiro envolvente virtual"
+=======
 msgid "Chat Input"
 msgstr "Entrada do chat"
 
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "Son envolvente virtual 7.1"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Monoaural analóxico"
 
 #: src/modules/alsa/alsa-mixer.c:4564
+<<<<<<< HEAD
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Monoaural analóxico"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Monoaural analóxico"
+=======
 msgid "Analog Mono (Left)"
 msgstr "Mono analóxico (Esquerda)"
 
 #: src/modules/alsa/alsa-mixer.c:4565
 msgid "Analog Mono (Right)"
 msgstr "Mono analóxico (Dereita)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
@@ -789,11 +853,19 @@ msgid "Stereo"
 msgstr "Estéreo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Auriculares con micro"
 
 #: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speakerphone"
 msgstr "Altofalante"
 
@@ -871,11 +943,19 @@ msgstr "Envolvente dixital 5.1 (HDMI)"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+=======
 msgstr "Chat"
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
 msgstr "Xogo"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4732
 msgid "Analog Mono Duplex"
@@ -899,10 +979,17 @@ msgstr "Dúplex estéreo"
 
 #: src/modules/alsa/alsa-mixer.c:4739
 msgid "Mono Chat + 7.1 Surround"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 msgstr "Chat mono + Son Envolvente 7.1"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Apagado"
 
@@ -916,7 +1003,11 @@ msgstr "Saída %s"
 msgid "%s Input"
 msgstr "Entrada %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -933,7 +1024,11 @@ msgstr ""
 "Espertáronnos co POLLOUT -- con todo un posterior snd_pcm_avail() devolveu 0 "
 "ou outro valor < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1032,6 +1127,71 @@ msgstr[1] ""
 "O máis probábel é que sexa un erro do controlador ALSA «%s». Informe disto "
 "aos desenvolvedores de ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Entrada de Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Saída de Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Sen mans"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Auriculares"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portátil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Automóbil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Hifi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Teléfono"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reprodución en alta fidelidade (A2DP Sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Captura en alta fidelidade (A2DP fonte )"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Unidade de auriculares con micrófono de cabeza (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Entrada de son por auriculares con micrófono (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Unidade de auriculares con micrófono de cabeza (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Entrada de son por auriculares con micrófono (HSP/HFP)"
+
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1091,6 +1251,7 @@ msgstr "Unidade de mans libres (HFP)"
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Porta de ligazón de audio para máns libres (HFP)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
 "source_name=<name for the source> source_properties=<properties for the "
@@ -1150,8 +1311,13 @@ msgstr ""
 "de canles> autoloaded=<estabelézao se este módulo se carga automaticamente> "
 "use_volume_sharing=<si ou non> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr "Ecualizador baseado en FFT en %s"
@@ -1191,11 +1357,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Destino nulo sincronizado"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Saída nula"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Saída nula"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
@@ -1219,14 +1393,24 @@ msgstr "Son en @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Túnel para %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Túnel a %s/%s"
@@ -1236,6 +1420,10 @@ msgid "Virtual surround sink"
 msgstr "Sumideiro envolvente virtual"
 
 #: src/modules/module-virtual-surround-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1256,7 +1444,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Modelo de dispositivo descoñecido"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Perfil estándar RAOP"
 
@@ -1467,7 +1659,10 @@ msgstr "Traseira superior dereita"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(incorrecto)"
 
@@ -1575,11 +1770,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Obxectivo do rexistro incorrecto."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Audio interno"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Audio interno"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Módem"
 
@@ -1855,7 +2058,11 @@ msgstr "Produciuse un fallo ao estabelecer o fluxo do monitor: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Produciuse un fallo en pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Produciuse un fallo na conexión: %s"
@@ -1894,7 +2101,11 @@ msgid "pa_stream_update_timing_info() failed: %s"
 msgstr "Produciuse un fallo en pa_stream_update_timing_info(): %s"
 
 #: src/utils/pacat.c:676
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "%s\n"
@@ -2064,7 +2275,11 @@ msgstr ""
 "Compilado con libpulse %s\n"
 "Vinculado con libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nome do cliente «%s» incorrecto"
@@ -2138,7 +2353,11 @@ msgstr ""
 "Aviso: o exemplo de especificación indicado vai ser sobrescrito coas "
 "especificacións do ficheiro."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 "Produciuse un fallo ao determinar a especificación de exemplo do ficheiro."
@@ -2176,7 +2395,11 @@ msgstr "reproducir"
 msgid "Failed to set media name."
 msgstr "Produciuse un fallo ao estabelecer o nome do multimedia."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Produciuse un fallo en pa_mainloop_new()."
 
@@ -2184,11 +2407,19 @@ msgstr "Produciuse un fallo en pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Produciuse un fallo en io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Produciuse un fallo en pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Produciuse un fallo en pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Produciuse un fallo en pa_context_connect(): %s"
@@ -2197,6 +2428,23 @@ msgstr "Produciuse un fallo en pa_context_connect(): %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Produciuse un fallo en pa_context_rttime_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Produciuse un fallo en pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NOME [ARGS ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NOME|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Produciuse un fallo en pa_mainloop_run()."
@@ -2212,6 +2460,7 @@ msgstr "NOME|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NOME"
 
@@ -2223,7 +2472,11 @@ msgstr "NOME|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NOME|#N 1|0"
 
@@ -2259,7 +2512,11 @@ msgstr "NOME_DA_RUTA"
 msgid "FILENAME SINK|#N"
 msgstr "NOME DE FICHEIRO DO SUMIDEIRO|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N SUMIDEIRO|ORIXE"
 
@@ -2267,6 +2524,17 @@ msgstr "#N SUMIDEIRO|ORIXE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PERFIL DA TARXETA"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NOME|#N PORTO"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PERFIL DA TARXETA"
@@ -2276,6 +2544,7 @@ msgid "NAME|#N PORT"
 msgstr "NOME|#N PORTO"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NOME-DA-TARXETA|TARXETA-#N DESFASE DO PORTO"
 
@@ -2291,9 +2560,15 @@ msgstr "NIVEL-NUMÉRICO"
 msgid "FRAMES"
 msgstr "MOSTRAS"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "MENSAXE DO DESTINATARIO [PARÁMETROS_DA_MENSAJE]"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:82
 #, c-format
@@ -2358,19 +2633,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Produciuse un fallo ao tentar obter as estatísticas: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Actualmente en uso: %u bloques contendo %s bytes en total.\n"
 msgstr[1] "Actualmente en uso: %u bloques contendo %s bytes en total.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2380,22 +2667,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Asignados ao longo do tempo: %u bloques contendo %s bytes en total.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Tamaño da caché de mostra: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Produciuse un fallo ao tentar obter información do servidor: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2412,7 +2716,11 @@ msgstr ""
 "Índice do cliente: %u\n"
 "Tamaño do recadro: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2435,6 +2743,79 @@ msgstr ""
 "Orixe predeterminada: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "descoñecido"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "Liña de entrada"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+#, fuzzy
+msgid "Handset"
+msgstr "Auriculares con micro"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+#, fuzzy
+msgid "Bluetooth"
+msgstr "Entrada de Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Monoaural analóxico"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "dispoñibilidade descoñecida"
@@ -2501,11 +2882,16 @@ msgstr "Analóxico"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Produciuse un fallo ao tentar obter información do destino: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2544,11 +2930,27 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortos:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, fuzzy, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr "\t\t%s: %s (prioridade: %u%s)\n"
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2559,22 +2961,36 @@ msgid ", availability group: "
 msgstr ", dispoñibilidade de grupo: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPorto activo: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormatos:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Produciuse un fallo ao tentar obter información da orixe: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2613,6 +3029,17 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/d"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2622,11 +3049,16 @@ msgid "n/a"
 msgstr "n/d"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Produciuse un fallo ao tentar obter información do módulo: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2643,12 +3075,20 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Produciuse un fallo ao tentar obter información do cliente: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2663,12 +3103,20 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Produciuse un fallo ao obter a información da tarxeta: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2685,30 +3133,51 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tPerfís:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (sinks: %u, orixes: %u, prioridade: %u, dispoñíbel: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tPerfil activo: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (tipo: %s, prioridade: %u, desprazamento de latencia: %<PRId64> "
 "usec%s%s, %s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2717,18 +3186,30 @@ msgstr ""
 "\t\t\tPropiedades:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tParte do perfil(s): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 "Produciuse un fallo ao tentar obter información da entrada do destino: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2767,12 +3248,20 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Produciuse un fallo ao obter información de saída da orixe: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2811,12 +3300,20 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Produciuse un fallo ao obter información da mostra: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2845,11 +3342,41 @@ msgstr ""
 "\tPropiedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Produciuse un fallo en: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "Produciuse un fallo na lectura read(): %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2877,11 +3404,16 @@ msgstr ""
 "obxecto JSON"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Produciuse un fallo a descarga do módulo: O módulo %s non se cargou"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2896,11 +3428,74 @@ msgstr[1] ""
 "Produciuse un fallo ao estabelecer o volume: tentou estabelecer o volume "
 "para %d canles, cando os canles permitidos son = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Produciuse un fallo ao enviar a mostra: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Fin prematuro de ficheiro"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "novo"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "cambiar"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "retirar"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "descoñecido"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "destino"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "orixe"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "entrada-destino"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "saída-orixe"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "módulo"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "cliente"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "caché-mostraxe"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "servidor"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "tarxeta"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Fin prematuro de ficheiro"
@@ -2958,10 +3553,78 @@ msgid "card"
 msgstr "tarxeta"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Evento «%s» en %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Obtívose SIGINT, saíndo."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Especificación incorrecta de volume"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volume fóra do rango permitido.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Número incorrecto das especificacións do volume.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "A especificación do volume é inconsistente.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opcións]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPO]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NOME_DE_FICHEIRO [NOME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NOME [SUMIDEIRO]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NOME|#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NOME|#N 1|0|alternar"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|alternar"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATOS"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Obtívose SIGINT, saíndo."
@@ -3027,6 +3690,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATOS"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3037,7 +3701,11 @@ msgstr ""
 "Os nomes especiais @DEFAULT_SINK@, @DEFAULT_SOURCE@ e @DEFAULT_MONITOR@\n"
 "poden usarse para especificar o destino, orixe e monitor predeterminados.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3061,7 +3729,11 @@ msgstr ""
 "  -n, --client-name=NOME                Como chamar a este cliente no "
 "servidor\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3072,16 +3744,31 @@ msgstr ""
 "Compilado con libpulse %s\n"
 "Vinculado con libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Formato do valor «%s» incorrecto"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Non especifique nada, ou un de: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Por favor, especifique un ficheiro de mostra para cargar"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Produciuse un fallo ao tentar abrir o ficheiro de son."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Por favor, especifique un ficheiro de mostra para cargar"
@@ -3091,11 +3778,39 @@ msgid "Failed to open sound file."
 msgstr "Produciuse un fallo ao tentar abrir o ficheiro de son."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Aviso: produciuse un fallo ao tentar determinar a especificación da mostra "
 "desde o ficheiro."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Debe especificar un nome de mostra para reproducir"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Debe especificar un nome de mostra para eliminar"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Debe especificar un índice para a entrada ao destino e un destino"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Debe especificar un índice para a saída da orixe e unha orixe"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Debe especificar un nome de módulo e os argumentos."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Debe de especificar un índice ou un nome do módulo"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Debe especificar un nome de mostra para reproducir"
@@ -3121,17 +3836,26 @@ msgid "You have to specify a module index or name"
 msgstr "Debe de especificar un índice ou un nome do módulo"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Non é posíbel especificar máis dun destino. Ten que especificar un valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Especificación de suspensión incorrecta."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Especificación de suspensión incorrecta."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3139,6 +3863,63 @@ msgstr ""
 "Non é posíbel especificar máis dunha orixe. Ten que especificar un valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Debe especificar un nome/índice de tarxeta e un nome de perfil"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Debe especificar un nome/índice de destino e un nome de porto"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Ten que especificar un nome de destino"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Debe especificar un nome/índice de orixe e un nome de porto"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Ten que especificar un nome para a fonte"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Ten que especificar un nome de destino"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Debe especificar un nome/índice de destino e un volume"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Ten que especificar un nome para a fonte"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Debe especificar un nome/índice de orixe e un volume"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Debe especificar un índice de destino e un volume"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Índice de entrada a destino incorrecto"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Debe especificar un índice de saída de orixe e un volume"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Índice de saída de orixe non válido"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Debe especificar un nome/índice de tarxeta e un nome de perfil"
@@ -3192,36 +3973,58 @@ msgid "Invalid source output index"
 msgstr "Índice de saída de orixe non válido"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Debe especificar un nome/índice sink e unha acción para silenciar (0, 1 ou "
 "'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Especificación de silenciado non válida"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Especificación de silenciado non válida"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Debe especificar un nome/índice de saída da orixe e unha acción para "
 "silenciar (0, 1 ou 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Debe especificar un índice de entrada sink e unha acción para silenciar (0, "
 "1 ou 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Especificación incorrecta de índice de entrada a destino"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Especificación incorrecta de índice de entrada a destino"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3229,6 +4032,18 @@ msgstr ""
 "Debe especificar un índice de saída da orixe e unha acción para silenciar "
 "(0, 1 ou 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Especificación de índice de saída de orixe non válida"
+
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "Debe especificar un nome/índice de destino e un nome de porto"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Especificación de índice de saída de orixe non válida"
@@ -3240,14 +4055,20 @@ msgstr ""
 "mensaxe"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Fornecéronse argumentos de máis, serán ignorados. Teña en conta que todos os "
 "parámetros de mensaxe deben ingresarse como unha única cadea."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3255,17 +4076,29 @@ msgstr ""
 "Debe especificar un índice de sumideiro e unha lista separada por puntos e "
 "comas dos formatos admitidos"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Debe de especificar un nome ou un índice de tarxeta, un nome de porto e un "
 "desfase (offset) de latencia"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Non foi posíbel procesar o desfase da latencia"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Non foi posíbel procesar o desfase da latencia"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Non se especificou ningunha orde correcta."
 
@@ -3310,7 +4143,11 @@ msgid "WARNING: Child process terminated by signal %u\n"
 msgstr "AVISO: o proceso fillo foi rematado polo sinal %u\n"
 
 #: src/utils/pasuspender.c:228
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options] -- PROGRAM [ARGUMENTS ...]\n"
 "\n"
@@ -3434,10 +4271,17 @@ msgstr "Aínda non está implementado.\n"
 
 #~ msgid "LFE on Separate Mono Output"
 #~ msgstr "LFE en Saída Mono analóxica"
+<<<<<<< HEAD
 
 #~ msgid "Digital Passthrough (S/PDIF)"
 #~ msgstr "«Passthrough» dixital (S/PDIF)"
 
+=======
+
+#~ msgid "Digital Passthrough (S/PDIF)"
+#~ msgstr "«Passthrough» dixital (S/PDIF)"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #~ msgid "Digital Passthrough (IEC958)"
 #~ msgstr "«Passthrough» dixital  (IEC958)"
 
diff --git a/po/gu.po b/po/gu.po
index e65889f17..fa3a58af3 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: PulseAudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:53+0000\n"
 "Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -168,10 +172,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail એ બુલિયન દલીલની ઇચ્છા રાખે છે"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level એ લોગ સ્તર દલીલની ઇચ્છા રાખે છે (ક્યાંતો સીમા 0..4 માં પૂર્ણસંખ્યા છે અથવા "
 "ડિબગ, જાણકારી, સૂચના, ચેતવણી, ભૂલ નું એક)."
@@ -589,7 +599,11 @@ msgid "Line In"
 msgstr "લાઇન-ઇન"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "માઇક્રોફોન"
 
@@ -612,12 +626,20 @@ msgid "Internal Microphone"
 msgstr "આંતરિક માઇક્રોફોન"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "રેડિયો"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "વિડિયો"
 
@@ -656,12 +678,20 @@ msgid "No Bass Boost"
 msgstr "બુસ્ટ નથી"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "ઍનલૉગ હૅડફોનો"
 
@@ -783,7 +813,11 @@ msgid "Stereo"
 msgstr "સ્ટેરિઓ"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -900,7 +934,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "બંધ"
 
@@ -914,7 +952,11 @@ msgstr "શૂન્ય આઉટપુટ"
 msgid "%s Input"
 msgstr "ઇનપુટ"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -931,7 +973,11 @@ msgstr ""
 "POLLOUT સુયોજન સાથે આપણે જાગેલ હતા -- છતાંપણ ના પછીનું snd_pcm_avail() ને 0 પાછો મળે "
 "છે અથવા બીજી કિંમત < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -968,6 +1014,84 @@ msgstr[1] ""
 "snd_pcm_avail() કિંમતને પાછુ મળેલ છે કે જે અપવાદ રીતે વિશાળ છે: %lu bytes (%lu ms).\n"
 "ALSA ડ્રાઇવર '%s' માં મોટેભાગે આ ભૂલ જેવુ છે. ALSA ડેવલ્પરોમાં આ સમસ્યાને મહેરબાની કરીને "
 "અહેવાલ કરો."
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-util.c:1249
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() કિંમતને પાછુ મળેલ છે કે જે અપવાદ રીતે વિશાળ છે: %li bytes (%s%lu "
+"ms).\n"
+"ALSA ડ્રાઇવર '%s' માં મોટેભાગે આ ભૂલ જેવુ છે. ALSA ડેવલ્પરોમાં આ સમસ્યાને મહેરબાની કરીને "
+"અહેવાલ કરો."
+msgstr[1] ""
+"snd_pcm_delay() કિંમતને પાછુ મળેલ છે કે જે અપવાદ રીતે વિશાળ છે: %li bytes (%s%lu "
+"ms).\n"
+"ALSA ડ્રાઇવર '%s' માં મોટેભાગે આ ભૂલ જેવુ છે. ALSA ડેવલ્પરોમાં આ સમસ્યાને મહેરબાની કરીને "
+"અહેવાલ કરો."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, fuzzy, 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 ""
+"snd_pcm_avail() કિંમતને પાછુ મળેલ છે કે જે અપવાદ રીતે વિશાળ છે: %lu bytes (%lu ms).\n"
+"ALSA ડ્રાઇવર '%s' માં મોટેભાગે આ ભૂલ જેવુ છે. ALSA ડેવલ્પરોમાં આ સમસ્યાને મહેરબાની કરીને "
+"અહેવાલ કરો."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() કિંમતને પાછુ મળેલ છે કે જે અપવાદ રીતે વિશાળ છે: %lu બાઇટો (%lu "
+"ms).\n"
+"ALSA ડ્રાઇવર '%s' માં મોટેભાગે આ ભૂલ જેવુ છે. ALSA ડેવલ્પરોમાં આ સમસ્યાને મહેરબાની કરીને "
+"અહેવાલ કરો."
+msgstr[1] ""
+"snd_pcm_mmap_begin() કિંમતને પાછુ મળેલ છે કે જે અપવાદ રીતે વિશાળ છે: %lu બાઇટો (%lu "
+"ms).\n"
+"ALSA ડ્રાઇવર '%s' માં મોટેભાગે આ ભૂલ જેવુ છે. ALSA ડેવલ્પરોમાં આ સમસ્યાને મહેરબાની કરીને "
+"અહેવાલ કરો."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+#, fuzzy
+msgid "Bluetooth Output"
+msgstr "ઍનલૉગ આઉટપુટ"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 
 #: src/modules/alsa/alsa-util.c:1249
 #, fuzzy, c-format
@@ -1044,10 +1168,30 @@ msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "ઍનલૉગ હૅડફોનો"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1065,15 +1209,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High Fidelity Playback (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "High Fidelity Capture (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1087,6 +1251,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1147,8 +1312,13 @@ msgstr ""
 "plugin name> label=<ladspa plugin label> control=<comma separated list of "
 "input control values>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1184,11 +1354,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "ક્લોક થયેલ NULL સિંક"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "શૂન્ય આઉટપુટ"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "શૂન્ય આઉટપુટ"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "સ્ત્રોત જાણકારીને મેળવવામાં નિષ્ફળતા: %s"
@@ -1211,14 +1389,24 @@ msgstr "@HOSTNAME@ પર ઓડિયો"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1250,6 +1438,16 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "અજ્ઞાત ભૂલ કોડ"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio સાઉન્ડ સર્વર"
+
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr ""
@@ -1258,6 +1456,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr "PulseAudio સાઉન્ડ સર્વર"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr "આગળનું કેન્દ્ર"
@@ -1433,6 +1632,101 @@ msgstr "ઑગ્ઝિલિઅરિ 31"
 #: src/pulse/channelmap.c:154
 msgid "Top Center"
 msgstr "ઊંચે કેન્દ્ર"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:156
+msgid "Top Front Center"
+msgstr "ઊંચે આગળ કેન્દ્ર"
+
+#: src/pulse/channelmap.c:157
+msgid "Top Front Left"
+msgstr "ઊંચે આગળ ડાબે"
+
+#: src/pulse/channelmap.c:158
+msgid "Top Front Right"
+msgstr "ઊંચે આગળ જમણે"
+
+#: src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "ઊંચે રિઅર કેન્દ્ર"
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "ઉપર રિઅર ડાબે"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "ઉપર રિઅર જમણે"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(અયોગ્ય)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "સરાઉન્ડ 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "સરાઉન્ડ 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "સરાઉન્ડ 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "સરાઉન્ડ 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "સરાઉન્ડ 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() નિષ્ફળ: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "કુકીની માહિતીને પદચ્છેદન કરવામાં નિષ્ફળ"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "અજ્ઞાત એક્સટેન્શન '%s' માટે મળેલ સંદેશ"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "ઇનપુટ"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "શૂન્ય આઉટપુટ"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+=======
 
 #: src/pulse/channelmap.c:156
 msgid "Top Front Center"
@@ -1527,6 +1821,7 @@ msgstr "શૂન્ય આઉટપુટ"
 msgid "bidirectional"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/direction.c:43
 #, fuzzy
 msgid "invalid"
@@ -1569,11 +1864,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] અયોગ્ય લોગ લક્ષ્ય '%s'."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "આંતરિક ઓડિયો"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "આંતરિક ઓડિયો"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "મોડેમ"
 
@@ -1849,7 +2152,11 @@ msgstr "સ્ટ્રીમને નિકાલ કરવામાં નિ
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() નિષ્ફળ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "જોડાણ નિષ્ફળ: %s"
@@ -2033,7 +2340,11 @@ msgstr ""
 "libpulse %s સાથે કમ્પાઇલ થયેલ છે\n"
 "libpulse %s સાથે કડી થયેલ છે\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "અયોગ્ય ક્લાઇન્ટ નામ '%s'"
@@ -2104,7 +2415,11 @@ msgid ""
 "specification from file."
 msgstr "ચેતવણી: સ્પષ્ટ થયેલ નમૂના સ્પષ્ટીકરણ ફાઇલ માંથી સ્પષ્ટીકરણ સાથે ઉપર લખાયેલ હશે."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ફાઇલ માંથી નમૂના સ્પષ્ટીકરણને નક્કી કરવામાં નિષ્ફળતા."
 
@@ -2139,7 +2454,11 @@ msgstr "પ્લેબેક"
 msgid "Failed to set media name."
 msgstr "આદેશ વાક્યને પદચ્છેદન કરવામાં નિષ્ફળ."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() નિષ્ફળ."
 
@@ -2147,11 +2466,19 @@ msgstr "pa_mainloop_new() નિષ્ફળ."
 msgid "io_new() failed."
 msgstr "io_new() નિષ્ફળ."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() નિષ્ફળ."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() નિષ્ફળ."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() નિષ્ફળ: %s"
@@ -2160,6 +2487,23 @@ msgstr "pa_context_connect() નિષ્ફળ: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_new() નિષ્ફળ."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() નિષ્ફળ."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() નિષ્ફળ."
@@ -2175,6 +2519,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2186,7 +2531,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2222,7 +2571,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2230,6 +2583,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2239,6 +2603,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2254,7 +2619,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2297,6 +2666,7 @@ msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 #, c-format
 msgid "connect(): %s"
 msgstr "connect(): %s"
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
@@ -2306,6 +2676,17 @@ msgstr "PulseAudio ડિમનને મારવામાં નિષ્ફ
 msgid "Daemon not responding."
 msgstr "ડિમન એ જવાબ આપતુ નથી."
 
+=======
+
+#: src/utils/pacmd.c:173
+msgid "Failed to kill PulseAudio daemon."
+msgstr "PulseAudio ડિમનને મારવામાં નિષ્ફળ."
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "ડિમન એ જવાબ આપતુ નથી."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
@@ -2321,17 +2702,37 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "પરિસ્થિતિઓને મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "હાલમાં વપરાશમાં છે: %u બ્લોકો %s કુલ બાઇટોને સમાવી રહ્યા છે.\n"
 msgstr[1] "હાલમાં વપરાશમાં છે: %u બ્લોકો %s કુલ બાઇટોને સમાવી રહ્યા છે.\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "આખી જીંદગી દરમ્યાન ફાળવેલ છે: %u બ્લોકો %s કુલ બાઇટોને સમાવી રહ્યા છે.\n"
+msgstr[1] "આખી જીંદગી દરમ્યાન ફાળવેલ છે: %u બ્લોકો %s કુલ બાઇટોને સમાવી રહ્યા છે.\n"
+
+#: src/utils/pactl.c:193
+=======
 
 #: src/utils/pactl.c:205
 #, fuzzy, c-format
@@ -2342,21 +2743,34 @@ msgstr[0] "આખી જીંદગી દરમ્યાન ફાળવેલ
 msgstr[1] "આખી જીંદગી દરમ્યાન ફાળવેલ છે: %u બ્લોકો %s કુલ બાઇટોને સમાવી રહ્યા છે.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "નમૂના કેશ માપ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "સર્વર જાણકારી મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2367,7 +2781,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2390,6 +2808,77 @@ msgstr ""
 "મૂળભૂત સ્ત્રોત: %s\n"
 "કુકી: %08x\n"
 
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "અજ્ઞાત આદેશ"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "લાઇન-ઇન"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "ઍનલૉગ મોનો"
+
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2459,11 +2948,16 @@ msgstr "ઍનલૉગ મોનો"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "સિંક જાણકારી મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2502,37 +2996,66 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tપોર્ટો:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tસક્રિય પોર્ટ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tપોર્ટો:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "સ્ત્રોત જાણકારીને મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2571,6 +3094,17 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2580,11 +3114,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "મોડ્યુલની જાણકારી મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2601,12 +3140,20 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "ક્લાઇન્ટ જાણકારી મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2621,12 +3168,20 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "કાર્ડ જાણકારી મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2643,45 +3198,77 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tરૂપરેખાઓ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tસક્રિય રૂપરેખા: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "સિંક ઇનપુટ જાણકારી મેળવવામાં નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2719,12 +3306,20 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "સ્ત્રોત આઉટપુટ જાણકારી મેળવવામાં નિષ્ફળ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2762,12 +3357,20 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "નમૂના જાણકારી મેળવવામાં નિષ્ફળ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2797,16 +3400,61 @@ msgstr ""
 "\tગુણધર્મો:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "નિષ્ફળતા: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() નિષ્ફળ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+#, fuzzy, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "નમૂનાને અપલોડ કરવામાં નિષ્ફળ: %s"
+
+#: src/utils/pactl.c:1051
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channel, whereas "
+"channel(s) supported = %d\n"
+msgid_plural ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel(s) supported = %d\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2842,10 +3490,62 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "નમૂનાને અપલોડ કરવામાં નિષ્ફળ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "ફાઇલનો નિયત સમય પહેલા અંત"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "ફાઇલનો નિયત સમય પહેલા અંત"
@@ -2895,19 +3595,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "અયોગ્ય સર્વર"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT મળ્યુ, બહાર નીકળી રહ્યા છે."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "અયોગ્ય નમૂના સ્પષ્ટીકરણ"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT મળ્યુ, બહાર નીકળી રહ્યા છે."
@@ -2921,15 +3645,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "અયોગ્ય નમૂના સ્પષ્ટીકરણ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "અયોગ્ય નમૂના સ્પષ્ટીકરણ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2975,6 +3751,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2982,7 +3759,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3003,7 +3784,11 @@ msgstr ""
 "  -s, --server=SERVER                   જોડાવવા માટે સર્વરનું નામ\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3014,16 +3799,55 @@ msgstr ""
 "libpulse %s સાથે કમ્પાઇલ થયેલ છે\n"
 "libpulse %s સાથે કડી થયેલ છે\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "અયોગ્ય સ્ટ્રીમ નામ '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "મહેરબાની કરીને લોડ કરવા માટે નમૂના ફાઇલને સ્પષ્ટ કરો"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "સાઉન્ડ ફાઇલને ખોલવામાં નિષ્ફળ."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "ચેતવણી: ફાઇલ માંથી નમૂના સ્પષ્ટીકરણ કરવાનું નક્કી કરવામાં નિષ્ફળ."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "વગાડવા માટે તમારે નમૂના નામને સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "દૂર કરવા માટે તમારે નમૂના નામને સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "સિંક ઇનપુટ અનુક્રમણિકા અને સિંકને તમારે સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "તમારે સ્ત્રોત આઉટપુટ અનુક્રમણિકા અને સ્ત્રોતને સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "તમારે મોડ્યુલ નામ અને દલીલોને સ્પષ્ટ કરવુ જ પડશે."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "મહેરબાની કરીને લોડ કરવા માટે નમૂના ફાઇલને સ્પષ્ટ કરો"
@@ -3057,28 +3881,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "તમારે મોડ્યુલ નામ અને દલીલોને સ્પષ્ટ કરવુ જ પડશે."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "તમારે મોડ્યુલ અનુક્રમણિકાને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "તમે એક સિંક કરતા વધારે સ્પષ્ટ કરી શકશો નહિં. તમારે બુલિયન કિંમતને સ્પષ્ટ કરવુ જ પડશે."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "અયોગ્ય નમૂના સ્પષ્ટીકરણ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "તમે એક સ્ત્રોત કરતા વધારે સ્પષ્ટ કરી શકશો નહિં. તમારે બુલિયન કિંમતને સ્પષ્ટ કરવુ જ પડશે."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
@@ -3088,33 +3936,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "વગાડવા માટે તમારે નમૂના નામને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "તમારે મોડ્યુલ અનુક્રમણિકાને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "વગાડવા માટે તમારે નમૂના નામને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને વોલ્યુમને સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને વોલ્યુમને સ્પષ્ટ કરવુ જ પડશે"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "તમારે મોડ્યુલ અનુક્રમણિકાને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને વોલ્યુમ સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "સિંક ઇનપુટ અનુક્રમણિકા અને વોલ્યુમને તમારે સ્પષ્ટ કરવુ જ પડશે"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "અયોગ્ય સિંક ઇનપુટ અનુક્રમણિકા"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને વોલ્યુમ સ્પષ્ટ કરવુ જ પડશે"
@@ -3128,83 +4012,141 @@ msgid "Invalid sink input index"
 msgstr "અયોગ્ય સિંક ઇનપુટ અનુક્રમણિકા"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "તમારે સ્ત્રોત આઉટપુટ અનુક્રમણિકા અને સ્ત્રોતને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "અયોગ્ય સિંક ઇનપુટ અનુક્રમણિકા"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "તમારે સિંક નામ/અનુક્રમણિકા અને મૂંગા બુલિયનને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "અયોગ્ય નમૂના સ્પષ્ટીકરણ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "તમારે સિંક નામ/અનુક્રમણિકા અને મૂંગા બુલિયનને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "સિંક ઇનપુટ અનુક્રમણિકા અને મૂંગા બુલિયનને તમારે સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "અયોગ્ય ઇનપુટ અનુક્રમણિકા સ્પષ્ટીકરણ"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "અયોગ્ય ઇનપુટ અનુક્રમણિકા સ્પષ્ટીકરણ"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "તમારે સિંક નામ/અનુક્રમણિકા અને મૂંગા બુલિયનને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "અયોગ્ય ઇનપુટ અનુક્રમણિકા સ્પષ્ટીકરણ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "તમારે સિંક નામ/અનુક્રમણિકા અને મૂંગા બુલિયનને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "તમારે કાર્ડ નામ/અનુક્રમણિકા અને પોર્ટ નામને સ્પષ્ટ કરવુ જ પડશે"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "યોગ્ય આદેશ સ્પષ્ટ થયેલ નથી."
 
diff --git a/po/he.po b/po/he.po
index 5352d73b1..3a599c302 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2021-05-12 11:02+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <https://translate.fedoraproject.org/projects/"
@@ -103,7 +107,11 @@ msgstr ""
 #: src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
+<<<<<<< HEAD
+"of debug, info, notice, warn, error)."
+=======
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 
 #: src/daemon/cmdline.c:277
@@ -492,6 +500,548 @@ msgstr "מיקרופון מתחנת עגינה"
 #: src/modules/alsa/alsa-mixer.c:2711
 msgid "Docking Station Line In"
 msgstr "קו נכנס מתחנת עגינה"
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
+msgid "Line In"
+msgstr "קו נכנס"
+
+#: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+msgid "Microphone"
+msgstr "מיקרופון"
+
+#: src/modules/alsa/alsa-mixer.c:2714 src/modules/alsa/alsa-mixer.c:2798
+msgid "Front Microphone"
+msgstr "מיקרופון קדמי"
+
+#: src/modules/alsa/alsa-mixer.c:2715 src/modules/alsa/alsa-mixer.c:2799
+msgid "Rear Microphone"
+msgstr "מיקרופון אחורי"
+
+#: src/modules/alsa/alsa-mixer.c:2716
+msgid "External Microphone"
+msgstr "מיקרופון חיצוני"
+
+#: src/modules/alsa/alsa-mixer.c:2717 src/modules/alsa/alsa-mixer.c:2801
+msgid "Internal Microphone"
+msgstr "מיקרופון פנימי"
+
+#: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+#: src/utils/pactl.c:295
+msgid "Radio"
+msgstr "רדיו"
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:296
+msgid "Video"
+msgstr "וידאו"
+
+#: src/modules/alsa/alsa-mixer.c:2720
+msgid "Automatic Gain Control"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2721
+msgid "No Automatic Gain Control"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2722
+msgid "Boost"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2723
+msgid "No Boost"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2724
+msgid "Amplifier"
+msgstr "מגבר"
+
+#: src/modules/alsa/alsa-mixer.c:2725
+msgid "No Amplifier"
+msgstr "אין מגבר"
+
+#: src/modules/alsa/alsa-mixer.c:2726
+msgid "Bass Boost"
+msgstr "הגברת באסים"
+
+#: src/modules/alsa/alsa-mixer.c:2727
+msgid "No Bass Boost"
+msgstr "ללא הגברת באסים"
+
+#: src/modules/alsa/alsa-mixer.c:2728
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+msgid "Speaker"
+msgstr "רמקול"
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:286
+msgid "Headphones"
+msgstr "אוזניות אנלוגיות"
+
+#: src/modules/alsa/alsa-mixer.c:2796
+msgid "Analog Input"
+msgstr "קלט אנלוגי"
+
+#: src/modules/alsa/alsa-mixer.c:2800
+msgid "Dock Microphone"
+msgstr "מיקרופון של תחנת עגינה"
+
+#: src/modules/alsa/alsa-mixer.c:2802
+msgid "Headset Microphone"
+msgstr "מיקרופון באוזניות"
+
+#: src/modules/alsa/alsa-mixer.c:2806
+msgid "Analog Output"
+msgstr "פלט אנלוגי"
+
+#: src/modules/alsa/alsa-mixer.c:2808
+msgid "Headphones 2"
+msgstr "אוזניות 2"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+msgid "Headphones Mono Output"
+msgstr "פלט מונו לאוזניות"
+
+#: src/modules/alsa/alsa-mixer.c:2810
+msgid "Line Out"
+msgstr "קו יוצא"
+
+#: src/modules/alsa/alsa-mixer.c:2811
+msgid "Analog Mono Output"
+msgstr "פלט מונו אנלוגי"
+
+#: src/modules/alsa/alsa-mixer.c:2812
+msgid "Speakers"
+msgstr "רמקולים"
+
+#: src/modules/alsa/alsa-mixer.c:2813
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
+
+#: src/modules/alsa/alsa-mixer.c:2814
+msgid "Digital Output (S/PDIF)"
+msgstr "פלט דיגיטלי (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2815
+msgid "Digital Input (S/PDIF)"
+msgstr "קלט דיגיטלי (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2816
+msgid "Multichannel Input"
+msgstr "קלט רב־ערוצי"
+
+#: src/modules/alsa/alsa-mixer.c:2817
+msgid "Multichannel Output"
+msgstr "פלט רב־ערוצי"
+
+#: src/modules/alsa/alsa-mixer.c:2818
+msgid "Game Output"
+msgstr "פלט משחק"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+msgid "Chat Output"
+msgstr "פלט צ׳אט"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+msgstr "קלט צ׳אט"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+msgid "Virtual Surround 7.1"
+msgstr "סראונד וירטואלי 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "מונו אנלוגי"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+msgid "Analog Mono (Left)"
+msgstr "מונו אנלוגי (שמאל)"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+msgid "Analog Mono (Right)"
+msgstr "מונו אנלוגי (ימין)"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "סטריאו אנלוגי"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "מונו"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "סטריאו"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr "אוזניות עם מיקרופון"
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+msgid "Speakerphone"
+msgstr "דיבורית לחדר ישיבות"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr "ערוצים מרובים"
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "סראונד אנלוגי 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "סראונד אנלוגי 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "סראונד אנלוגי 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "סראונד אנלוגי 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "סראונד אנלוגי 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "סראונד אנלוגי 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "סראונד אנלוגי 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "סראונד אנלוגי 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "סראונד אנלוגי 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "סראונד אנלוגי 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "סראונד אנלוגי 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "סטריאו דיגיטלי (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "סראונד דיגיטלי 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "סראונד דיגיטלי 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "סראונד דיגיטלי 5.1 (IEC958/DTS)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "סטריאו דיגיטלי (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "סראונד דיגיטלי 5.1 (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr "משחק"
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "מונו אנלוגי משולב"
+
+#: src/modules/alsa/alsa-mixer.c:4733
+msgid "Analog Stereo Duplex"
+msgstr "סטריאו אנלוגי משולב"
+
+#: src/modules/alsa/alsa-mixer.c:4736
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "סטריאו דיגיטלי משולב (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4738
+msgid "Stereo Duplex"
+msgstr "סטריאו משולב"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+msgid "Off"
+msgstr "מכובה"
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, c-format
+msgid "%s Output"
+msgstr "פלט %s"
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, c-format
+msgid "%s Input"
+msgstr "קלט %s"
+
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+#, 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/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, 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/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+msgstr[1] ""
+
+#: src/modules/alsa/alsa-util.c:1249
+#, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+msgstr[1] ""
+
+#: src/modules/alsa/alsa-util.c:1296
+#, 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/modules/alsa/alsa-util.c:1339
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+msgstr[1] ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "קלט בלוטות׳"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "פלט בלוטות׳"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "דיבורית"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "אוזניות"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "נייד"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "מכונית"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "טלפון"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "יחידת ראש של אוזניות (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "מגשר שמע לשפופרת (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr ""
+
+#: src/modules/echo-cancel/module-echo-cancel.c:59
+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> use_master_format=<yes "
+"or no> "
+msgstr ""
+
+#. add on profile
+#: src/modules/macosx/module-coreaudio-device.c:825
+msgid "On"
+msgstr "פעיל"
+
+#: src/modules/module-allow-passthrough.c:71
+#: src/modules/module-always-sink.c:80
+msgid "Dummy Output"
+msgstr "פלט מדומה"
+
+#: src/modules/module-always-sink.c:34
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr ""
+
+#: src/modules/module-always-source.c:35
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr ""
+
+#: src/modules/module-equalizer-sink.c:68
+msgid "General Purpose Equalizer"
+msgstr ""
+
+#: src/modules/module-equalizer-sink.c:72
+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/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr ""
+
+#: src/modules/module-filter-apply.c:47
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr ""
+
+#: src/modules/module-ladspa-sink.c:50
+msgid "Virtual LADSPA sink"
+msgstr ""
+
+#: src/modules/module-ladspa-sink.c:54
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"sink_input_properties=<properties for the sink input> master=<name of sink "
+"to filter> 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> autoloaded=<set if this module "
+"is being loaded automatically> "
+msgstr ""
+
+#: src/modules/module-null-sink.c:46
+msgid "Clocked NULL sink"
+msgstr ""
+
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "פלט ריק"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+#, c-format
+msgid "Failed to set format: invalid format string %s"
+msgstr ""
+
+#: src/modules/module-rygel-media-server.c:506
+#: src/modules/module-rygel-media-server.c:544
+#: src/modules/module-rygel-media-server.c:903
+msgid "Output Devices"
+msgstr "התקני פלט"
+
+#: src/modules/module-rygel-media-server.c:507
+#: src/modules/module-rygel-media-server.c:545
+#: src/modules/module-rygel-media-server.c:904
+msgid "Input Devices"
+msgstr "התקני קלט"
+
+=======
 
 #: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
 msgid "Line In"
@@ -1032,20 +1582,31 @@ msgstr "התקני פלט"
 msgid "Input Devices"
 msgstr "התקני קלט"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/module-rygel-media-server.c:1061
 msgid "Audio on @HOSTNAME@"
 msgstr ""
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1069,7 +1630,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "דגם התקן לא ידוע"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1280,7 +1845,10 @@ msgstr "עליון ימני אחורי"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(לא תקף)"
 
@@ -1382,11 +1950,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "צליל פנימי"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "צליל פנימי"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "מודם"
 
@@ -1661,7 +2237,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "שגיאת התחברות: %s"
@@ -1781,6 +2361,7 @@ msgstr ""
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to STDOUT or "
 "the specified file."
+<<<<<<< HEAD
 msgstr ""
 
 #: src/utils/pacat.c:805
@@ -1789,6 +2370,16 @@ msgid ""
 "server."
 msgstr ""
 
+=======
+msgstr ""
+
+#: src/utils/pacat.c:805
+msgid ""
+"Play back audio data from STDIN or the specified file on a PulseAudio sound "
+"server."
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:819
 #, c-format
 msgid ""
@@ -1797,7 +2388,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1868,7 +2463,11 @@ msgid ""
 "specification from file."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1902,7 +2501,11 @@ msgstr "נגינה"
 msgid "Failed to set media name."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1910,11 +2513,19 @@ msgstr ""
 msgid "io_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr ""
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr ""
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1923,6 +2534,23 @@ msgstr ""
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr ""
@@ -1938,6 +2566,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -1949,7 +2578,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -1985,7 +2618,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -1993,6 +2630,28 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr ""
+
+#: src/utils/pacmd.c:75
+msgid "TARGET"
+msgstr ""
+
+#: src/utils/pacmd.c:76
+msgid "NUMERIC-LEVEL"
+msgstr ""
+
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2013,11 +2672,16 @@ msgstr ""
 msgid "NUMERIC-LEVEL"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:79
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2075,19 +2739,31 @@ msgstr ""
 msgid "read(): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2095,22 +2771,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2121,7 +2813,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2135,6 +2831,74 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "זמינות לא ידועה"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "זמין"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "לא זמין"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "לא ידוע"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "קו"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "מיקרופון"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "שפופרת"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "אוזניה"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "טלוויזיה"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "בלוטות׳"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "רשת"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "אנלוגי"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "זמינות לא ידועה"
@@ -2201,11 +2965,16 @@ msgstr "אנלוגי"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2227,37 +2996,66 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2279,6 +3077,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "לא זמין"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2288,11 +3097,16 @@ msgid "n/a"
 msgstr "לא זמין"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2303,12 +3117,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2318,12 +3140,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2334,45 +3164,77 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tפרופילים:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2394,12 +3256,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2421,12 +3291,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2443,21 +3321,44 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "כשל: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2467,16 +3368,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2487,11 +3397,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "הסרה"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "לא ידוע"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "מקור"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "שרת"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "כרטיס"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr ""
@@ -2549,10 +3522,78 @@ msgid "card"
 msgstr "כרטיס"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr ""
@@ -2618,6 +3659,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2625,22 +3667,33 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -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 ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2648,6 +3701,50 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+#, c-format
+msgid "Specify nothing, or one of: %s"
+msgstr ""
+
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr ""
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
@@ -2695,20 +3792,84 @@ msgid "You have to specify a module index or name"
 msgstr ""
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr ""
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr ""
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
@@ -2762,35 +3923,68 @@ msgid "Invalid source output index"
 msgstr ""
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr ""
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr ""
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr ""
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr ""
@@ -2800,17 +3994,33 @@ msgid "You have to specify at least an object path and a message name"
 msgstr ""
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -2820,6 +4030,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index b145da8e5..8eb31c46d 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:54+0000\n"
 "Last-Translator: Rajesh Ranjan <rajesh672@gmail.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
@@ -176,10 +180,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail के लिए बुलियन तर्क की आशा है"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of debug, info, notice, warn, error)."
@@ -595,7 +605,11 @@ msgid "Line In"
 msgstr "लाइन इन"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "माइक्रोफोन"
 
@@ -618,12 +632,20 @@ msgid "Internal Microphone"
 msgstr "आंतरिक माइक्रोफोन"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "रेडियो"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "वीडियो"
 
@@ -662,12 +684,20 @@ msgid "No Bass Boost"
 msgstr "कोई बढ़ावा नहीं"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "एनालॉग हेडफोन"
 
@@ -789,7 +819,11 @@ msgid "Stereo"
 msgstr "स्टीरियो"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -906,7 +940,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "बंद"
 
@@ -920,7 +958,11 @@ msgstr "रिक्त आउटपुट"
 msgid "%s Input"
 msgstr "इनपुट"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -937,7 +979,11 @@ msgstr ""
 "हमें POLLOUT सेट के साथ तैयार किया गया है  -- हालांकि परवर्ती snd_pcm_avail() ने 0 या "
 "दूसरा मान < min_avail दिया."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1031,6 +1077,16 @@ msgstr[1] ""
 "अधिक संभव है कि यह ALSA ड्राइवर '%s' में एक बग है. इस मुद्दे को ALSA डेवलेपर को रिपोर्ट "
 "करें."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1039,19 +1095,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "एनालॉग आउटपुट"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "एनालॉग हेडफोन"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1069,15 +1153,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "उच्च विश्वसनीयतायुक्ति प्लेबैक (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "उच्च विश्वसनीयता कैप्चर (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1091,6 +1195,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1151,8 +1256,13 @@ msgstr ""
 "plugin name> label=<ladspa plugin label> control=<comma separated list of "
 "input control values>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1188,11 +1298,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "क्लॉक्ड रिक्त सिंक"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "रिक्त आउटपुट"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "रिक्त आउटपुट"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "स्रोत सूचना पाने में विफल: %s"
@@ -1215,14 +1333,24 @@ msgstr "@HOSTNAME@ पर ऑडियो"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1254,7 +1382,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "अज्ञात त्रुटि कोड"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1449,6 +1581,89 @@ msgstr "शीर्ष अग्र वाम"
 #: src/pulse/channelmap.c:158
 msgid "Top Front Right"
 msgstr "ऊपर अग्र दायाँ"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "ऊपर पश्च केंद्र"
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "ऊपर पश्च बायाँ"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "ऊपर पश्च दायाँ"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(अवैध)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "सर्राउंड 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "सर्राउंड 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "सर्राउंड 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "सर्राउंड 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "सर्राउंड 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() विफल: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "कुकी आंकड़ा के विश्लेषण में विफल"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "अज्ञात विस्तार '%s' के लिए संदेश प्राप्त"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "इनपुट"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "रिक्त आउटपुट"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+=======
 
 #: src/pulse/channelmap.c:160
 msgid "Top Rear Center"
@@ -1531,6 +1746,7 @@ msgstr "रिक्त आउटपुट"
 msgid "bidirectional"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/direction.c:43
 #, fuzzy
 msgid "invalid"
@@ -1573,11 +1789,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] अवैध लॉग लक्ष्य '%s'."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "आंतरिक ऑडियो"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "आंतरिक ऑडियो"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "मॉडेम"
 
@@ -1853,7 +2077,11 @@ msgstr "स्ट्रीम से खींचने में विफल:
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "कनेक्शन विफल.%s"
@@ -2047,7 +2275,11 @@ msgstr ""
 "लिबपल्स %s के साथ कंपाइल\n"
 "लिबपल्स %s के साथ लिंक\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "अवैध क्लाइंट नाम '%s'"
@@ -2118,7 +2350,11 @@ msgid ""
 "specification from file."
 msgstr "चेतावनी: निर्दिष्ट नमूना विनिर्दिष्टता को फ़ाइल की विनिर्दिष्टता से लिखा जाएगा."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "फ़ाइल से नमूना विनिर्दिष्टता निर्धारित करने में विफल."
 
@@ -2153,7 +2389,11 @@ msgstr "प्लेबैक"
 msgid "Failed to set media name."
 msgstr "कमांड लाइन विश्लेषण में विफल."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() विफल."
 
@@ -2161,11 +2401,19 @@ msgstr "pa_mainloop_new() विफल."
 msgid "io_new() failed."
 msgstr "io_new() विफल."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() विफल."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() विफल."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() विफल: %s"
@@ -2174,6 +2422,23 @@ msgstr "pa_context_connect() विफल: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() विफल."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() विफल."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() विफल."
@@ -2189,6 +2454,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2200,7 +2466,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2236,7 +2506,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2244,6 +2518,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2253,6 +2538,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2268,7 +2554,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2298,11 +2588,19 @@ msgstr ""
 "pacat %s\n"
 "लिबपल्स %s के साथ कंपाइल\n"
 "लिबपल्स %s के साथ लिंक\n"
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:143
 msgid "No PulseAudio daemon running, or not running as session daemon."
 msgstr "कोई पल्सऑडियो डेमॉन चल रहा है, या चयन डेमॉन के तहत चल रहा है."
 
+=======
+
+#: src/utils/pacmd.c:143
+msgid "No PulseAudio daemon running, or not running as session daemon."
+msgstr "कोई पल्सऑडियो डेमॉन चल रहा है, या चयन डेमॉन के तहत चल रहा है."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:148
 #, c-format
 msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
@@ -2336,17 +2634,37 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "आंकड़े पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "प्रयोग में मुद्रा: %u ब्लॉक %s बाइट कुल समाहित करता है.\n"
 msgstr[1] "प्रयोग में मुद्रा: %u ब्लॉक %s बाइट कुल समाहित करता है.\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "संपूर्ण जीवनचक्र के दौरान आबंटित: %u ब्लॉक %s बाइट कुल को समाहित करता है.\n"
+msgstr[1] "संपूर्ण जीवनचक्र के दौरान आबंटित: %u ब्लॉक %s बाइट कुल को समाहित करता है.\n"
+
+#: src/utils/pactl.c:193
+=======
 
 #: src/utils/pactl.c:205
 #, fuzzy, c-format
@@ -2357,21 +2675,34 @@ msgstr[0] "संपूर्ण जीवनचक्र के दौरान
 msgstr[1] "संपूर्ण जीवनचक्र के दौरान आबंटित: %u ब्लॉक %s बाइट कुल को समाहित करता है.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "नमूना कैश आकार: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "सर्वर सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2382,7 +2713,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2405,6 +2740,21 @@ msgstr ""
 "तयशुदा स्रोत: %s\n"
 "कुकी: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2418,19 +2768,67 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "अनजान कमांड"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "लाइन इन"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2468,17 +2866,27 @@ msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "एनालॉग मोनो"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "सिंक सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2517,37 +2925,66 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorts:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tActive Port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tPorts:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "स्रोत सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2586,6 +3023,17 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2595,11 +3043,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "मॉड्यूल सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2616,12 +3069,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "क्लाइंट सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2636,12 +3097,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "कार्ड सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2658,45 +3127,77 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfiles:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tActive Profile: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "सिंक इनपुट सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2734,12 +3235,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "स्रोत आउटपुट सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2777,12 +3286,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "नमूना सूचना पाने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2812,21 +3329,49 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "विफलता: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2841,11 +3386,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "नमूना अफलोड करने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2856,11 +3406,66 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "नमूना अफलोड करने में विफल: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "फ़ाइल का असामयिक अंत"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "फ़ाइल का असामयिक अंत"
@@ -2910,19 +3515,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "अवैध सर्वर"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT पाया, निकल रहा है."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "अवैध आयतन विनिर्दिष्टता"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT पाया, निकल रहा है."
@@ -2936,15 +3565,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "अवैध आयतन विनिर्दिष्टता"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "अवैध आयतन विनिर्दिष्टता"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2990,6 +3671,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2997,7 +3679,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3019,7 +3705,11 @@ msgstr ""
 "to\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3030,16 +3720,55 @@ msgstr ""
 "लिबपल्स %s से कंपाइल\n"
 "लिबपल्स %s से कड़ीबद्ध\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "अवैध स्ट्रीम नाम '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "लोड करने के लिए किसी नमूना फ़ाइल निर्दिष्ट करें"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "ध्वनि फ़ाइल खोलने में विफल."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "%s स्ट्रीम को किसी नमूना विनिर्दिष्टता '%s' के साथ खोल रहा है."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "आपको किसी नमूना नाम को बजाने के लिए निर्दिष्ट करना है"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "आपको किसी नमूना नाम को हटाने के लिए निर्दिष्ट करना है"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "आपको किसी सिंक इनपुट सूची और सिंक को निर्दिष्ट करना है"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "आपको किसी सिंक स्रोत आउटपुट और स्रोत को निर्दिष्ट करना है"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "आपको किसी मॉड्यूल नाम और वितर्क को निर्दिष्ट करना है"
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "लोड करने के लिए किसी नमूना फ़ाइल निर्दिष्ट करें"
@@ -3073,22 +3802,35 @@ msgid "You have to specify a module name and arguments."
 msgstr "आपको किसी मॉड्यूल नाम और वितर्क को निर्दिष्ट करना है"
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "आपको किसी मॉड्यूल सूची को निर्दिष्ट करना है"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "आप एक सिंक से अधिक निर्दिष्ट नहीं कर सकते हैं. आपको किसी बुलियन मान को निर्दिष्ट करना है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "अवैध नमूना विनिर्दिष्टता"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3096,6 +3838,17 @@ msgstr ""
 "आप एक स्रोत से अधिक निर्दिष्ट नहीं कर सकते हैं. आपको किसी बुलियन मान को निर्दिष्ट करना "
 "है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "आपको किसी कार्ड नाम/सूची और प्रोफ़ाइल नाम को निर्दिष्ट करना है."
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "आपको किसी कार्ड नाम/सूची और पोर्ट नाम को निर्दिष्ट करना है."
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "आपको किसी कार्ड नाम/सूची और प्रोफ़ाइल नाम को निर्दिष्ट करना है."
@@ -3105,33 +3858,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "आपको किसी कार्ड नाम/सूची और पोर्ट नाम को निर्दिष्ट करना है."
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "आपको किसी नमूना नाम को बजाने के लिए निर्दिष्ट करना है"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "आपको किसी स्रोत नाम/सूची और पोर्ट नाम को निर्दिष्ट करना है."
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "आपको किसी स्रोत नाम/सूची और पोर्ट नाम को निर्दिष्ट करना है."
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "आपको किसी मॉड्यूल सूची को निर्दिष्ट करना है"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "आपको किसी नमूना नाम को बजाने के लिए निर्दिष्ट करना है"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "आपको किसी सिंक नाम/सूची और वाल्यूम को निर्दिष्ट करना है."
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "आपको किसी सिंक नाम/सूची और वाल्यूम को निर्दिष्ट करना है."
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "आपको किसी मॉड्यूल सूची को निर्दिष्ट करना है"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "आपको किसी स्रोत नाम/सूची और आयतन को निर्दिष्ट करना है."
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "आपने किसी सिंक इनपुट सूची और आयतन को निर्दिष्ट किया है"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "अवैध सिंक इनपुट सूची"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "आपको किसी स्रोत नाम/सूची और आयतन को निर्दिष्ट करना है."
@@ -3145,83 +3934,141 @@ msgid "Invalid sink input index"
 msgstr "अवैध सिंक इनपुट सूची"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "आपको किसी सिंक स्रोत आउटपुट और स्रोत को निर्दिष्ट करना है"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "अवैध सिंक इनपुट सूची"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "आपको किसी कार्ड नाम/सूची और मूक बुलियन नाम को निर्दिष्ट करना है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "अवैध नमूना विनिर्दिष्टता"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "आपको किसी स्रोत नाम/सूची और मूल बुलियन को निर्दिष्ट करना है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "आपने किसी सिंक इनपुट सूची और मूल बुलियन को निर्दिष्ट किया है"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "अवैध सिंक इनपुट सूची विनिर्दिष्टता"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "अवैध सिंक इनपुट सूची विनिर्दिष्टता"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "आपको किसी स्रोत नाम/सूची और मूल बुलियन को निर्दिष्ट करना है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "अवैध सिंक इनपुट सूची विनिर्दिष्टता"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "आपको किसी कार्ड नाम/सूची और पोर्ट नाम को निर्दिष्ट करना है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "आपको किसी कार्ड नाम/सूची और मूक बुलियन नाम को निर्दिष्ट करना है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "आपको किसी कार्ड नाम/सूची और प्रोफ़ाइल नाम को निर्दिष्ट करना है."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "कोई वैध कमांड निर्दिष्ट नहीं."
 
diff --git a/po/hr.po b/po/hr.po
index d25d8d8ca..1b67e7c51 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,9 +8,15 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2020-07-15 19:29+0000\n"
+"Last-Translator: Milo Ivir <mail@milotype.de>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-03-28 19:10+0000\n"
 "Last-Translator: Gogo Gogsi <linux.hr@protonmail.com>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: Croatian <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/hr/>\n"
 "Language: hr\n"
@@ -19,7 +25,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.1.1\n"
+=======
 "X-Generator: Weblate 4.11.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "X-Launchpad-Export-Date: 2017-04-20 21:04+0000\n"
 
 #: src/daemon/cmdline.c:113
@@ -188,8 +198,13 @@ msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
 msgstr ""
+<<<<<<< HEAD
+"--log-level očekuje argument na razini zapisa (numerički u rasponu od 0 do 4 "
+"ili jedan od sljedećih: debug, info, notice, warn, error)."
+=======
 "--log-level očekuje argument na razini zapisa (brojčani u rasponu od 0 do 4 "
 "ili jedan od sljedećih: error, debug, info, notice, warn)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:277
 msgid "--high-priority expects boolean argument"
@@ -608,7 +623,11 @@ msgid "Line In"
 msgstr "Ulaz"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -629,12 +648,20 @@ msgid "Internal Microphone"
 msgstr "Unutarnji mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -671,12 +698,20 @@ msgid "No Bass Boost"
 msgstr "Bez pojačanja basa"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Zvučnik"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Slušalice"
 
@@ -697,8 +732,14 @@ msgid "Analog Output"
 msgstr "Analogni izlaz"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Slušalice"
+=======
 msgid "Headphones 2"
 msgstr "Slušalice 2"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2809
 msgid "Headphones Mono Output"
@@ -718,7 +759,7 @@ msgstr "Zvučnici"
 
 #: src/modules/alsa/alsa-mixer.c:2813
 msgid "HDMI / DisplayPort"
-msgstr "HDMI / DisplayPort"
+msgstr "HDMI / Ekranski priključak"
 
 #: src/modules/alsa/alsa-mixer.c:2814
 msgid "Digital Output (S/PDIF)"
@@ -745,24 +786,46 @@ msgid "Chat Output"
 msgstr "Izlaz razgovora"
 
 #: src/modules/alsa/alsa-mixer.c:2821
+<<<<<<< HEAD
+#, fuzzy
+msgid "Chat Input"
+msgstr "Izlaz razgovora"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Virtalni surround slivnik"
+=======
 msgid "Chat Input"
 msgstr "Ulaz razgovora"
 
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "Virtalni surround 7.1"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Analogni mono"
 
 #: src/modules/alsa/alsa-mixer.c:4564
+<<<<<<< HEAD
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Analogni mono"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Analogni mono"
+=======
 msgid "Analog Mono (Left)"
 msgstr "Analogni mono (lijevi)"
 
 #: src/modules/alsa/alsa-mixer.c:4565
 msgid "Analog Mono (Right)"
 msgstr "Analogni mono (desni)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
@@ -784,11 +847,19 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Slušalice s mikrofonom"
 
 #: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speakerphone"
 msgstr "Zvučnik"
 
@@ -866,11 +937,19 @@ msgstr "Digitalni surround 5.1 (HDMI)"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+=======
 msgstr "Razgovor"
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
 msgstr "Igra"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4732
 msgid "Analog Mono Duplex"
@@ -894,10 +973,17 @@ msgstr "Stereo obostrani"
 
 #: src/modules/alsa/alsa-mixer.c:4739
 msgid "Mono Chat + 7.1 Surround"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 msgstr "Mono razgovor + 7.1 Surround"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Isključeno"
 
@@ -911,7 +997,11 @@ msgstr "%s izlaz"
 msgid "%s Input"
 msgstr "%s ulaz"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -928,7 +1018,11 @@ msgstr ""
 "Probudila nas je POLLOUT postavka -- međutim naknadno snd_pcm_avail() je "
 "vratio 0 ili drugu vrijednost < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1042,6 +1136,70 @@ msgstr[2] ""
 "Najvjerojatnije je ovo greška ALSA upravljačkog programa '%s'. Prijavite "
 "problem ALSA razvijateljima."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth ulaz"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth izlaz"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Bez-ruku"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Slušalice"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Prijenosnik"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Automobil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reprodukcija visoke autentičnosti (A2DP slivnik)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Snimanje visoke autentičnosti (A2DP izvor)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Jedinica slušalice s mikrofonom (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Zvučni pristupnik slušalice s mikrofonom (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Jedinica slušalice s mikrofonom (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Zvučni pristupnik slušalice s mikrofonom (HSP/HFP)"
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1100,6 +1258,7 @@ msgstr "Jedinica bez-ruku, slušalice s mikrofonom (HFP)"
 #: src/modules/bluetooth/module-bluez5-device.c:2105
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Zvučni pristupnik, bez-ruku (HFP)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
@@ -1160,8 +1319,11 @@ msgstr ""
 "autoloaded=<postavi ako se ovaj modul učitava automatski> "
 "use_volume_sharing=<da ili ne> "
 
+<<<<<<< HEAD
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/module-equalizer-sink.c:1094
 #: src/modules/module-equalizer-sink.c:1217
 #, c-format
@@ -1202,11 +1364,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Prikriven nekorišten slivnik"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Nema izlaza"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Nema izlaza"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Neuspjelo postavljanje formata: neispravni znak formata %s"
@@ -1229,18 +1399,28 @@ msgstr "Zvuk na @NAZIVRAČUNALA@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
 #: src/modules/module-tunnel-sink-new.c:356
 #: src/modules/module-tunnel-source-new.c:342
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunel za %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
 #: src/modules/module-tunnel-sink-new.c:697
 #: src/modules/module-tunnel-source-new.c:668
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunel do %s/%s"
@@ -1250,6 +1430,10 @@ msgid "Virtual surround sink"
 msgstr "Virtalni surround slivnik"
 
 #: src/modules/module-virtual-surround-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1271,7 +1455,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Nepoznat model uređaja"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "RAOP standardan profil"
 
@@ -1482,7 +1670,10 @@ msgstr "Gornji zadnji desni"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(neispravno)"
 
@@ -1589,11 +1780,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Neispravno odredište zapisa."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Ugrađeni zvuk"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609 src/pulsecore/sink.c:3600
 msgid "Built-in Audio"
 msgstr "Ugrađeni zvuk"
 
 #: src/pulsecore/sink.c:3614 src/pulsecore/sink.c:3605
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1871,7 +2070,11 @@ msgstr "Neuspjelo postavljanje nadgledanja strujanja: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() neuspjelo: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Povezivanje neuspjelo: %s"
@@ -1910,7 +2113,11 @@ msgid "pa_stream_update_timing_info() failed: %s"
 msgstr "pa_stream_update_timing_info() neuspjelo: %s"
 
 #: src/utils/pacat.c:676
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "%s\n"
@@ -2079,7 +2286,11 @@ msgstr ""
 "Kompiliran s libpulse %s\n"
 "Povezan s libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Neispravan naziv klijenta '%s'"
@@ -2151,7 +2362,11 @@ msgid ""
 msgstr ""
 "Upozorenje: određeni opis uzorka biti će prepisan s opisom iz datoteke."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Neuspjelo određivanje opisa uzorka iz datoteke."
 
@@ -2185,7 +2400,11 @@ msgstr "reprodukcija"
 msgid "Failed to set media name."
 msgstr "Neuspjelo postavljanje medijskog naziva."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() neuspjelo."
 
@@ -2193,11 +2412,19 @@ msgstr "pa_mainloop_new() neuspjelo."
 msgid "io_new() failed."
 msgstr "io_new() neuspjelo."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() neuspjelo."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() neuspjelo."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() neuspjelo: %s"
@@ -2206,6 +2433,23 @@ msgstr "pa_context_connect() neuspjelo: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() neuspjelo."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() neuspjelo."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAZIV [ARGU ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAZIV|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() neuspjelo."
@@ -2221,6 +2465,7 @@ msgstr "NAZIV|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAZIV"
 
@@ -2232,7 +2477,11 @@ msgstr "NAZIV|#N UREĐAJ"
 msgid "#N VOLUME"
 msgstr "#N UREĐAJ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAZIV|#N 1|0"
 
@@ -2268,7 +2517,11 @@ msgstr "NAZIV PUTANJE"
 msgid "FILENAME SINK|#N"
 msgstr "NAZIV DATOTEKE SLIVNIKA|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N SLIVNIK|IZVOR"
 
@@ -2276,6 +2529,17 @@ msgstr "#N SLIVNIK|IZVOR"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PROFIL KARTICE"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAZIV|#N ULAZ"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PROFIL KARTICE"
@@ -2285,6 +2549,7 @@ msgid "NAME|#N PORT"
 msgstr "NAZIV|#N ULAZ"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NAZIV-KARTICE|KARTICA-#N POMAK ULAZA"
 
@@ -2300,9 +2565,15 @@ msgstr "BROJČANA-RAZINA"
 msgid "FRAMES"
 msgstr "OKVIRI"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "PORUKA PRIMATELJA [PARAMETRI_PORUKE]"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:82
 #, c-format
@@ -2367,12 +2638,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Neuspjelo dobivanje statistike: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2380,7 +2659,11 @@ msgstr[0] "Trenutno u upotrebi: %u blok sadrži %s ukupno bajta.\n"
 msgstr[1] "Trenutno u upotrebi: %u bloka sadrže %s ukupno bajta.\n"
 msgstr[2] "Trenutno u upotrebi: %u blokova sadrže %s ukupno bajta.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2395,22 +2678,39 @@ msgstr[2] ""
 "Dodijeljeno tijekom cijelog vijeka trajanja: %u blokova sadrži %s ukupno "
 "bajta.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Veličina predmemorije uzorka: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Neuspjelo dobivanje informacija poslužitelja: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2427,7 +2727,11 @@ msgstr ""
 "Sadržaj klijenta: %u\n"
 "Veličina pločice: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2450,6 +2754,79 @@ msgstr ""
 "Zadani izvor: %s\n"
 "Kolačić: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "nepoznat"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "Ulaz"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+#, fuzzy
+msgid "Handset"
+msgstr "Slušalice s mikrofonom"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+#, fuzzy
+msgid "Bluetooth"
+msgstr "Bluetooth ulaz"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Analogni mono"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "dostupnost nepoznata"
@@ -2516,11 +2893,16 @@ msgstr "Analogno"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Neuspjelo dobivanje informacija slivnika: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2559,11 +2941,27 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tUlazi:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, fuzzy, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr "\t\t%s: %s (slivnici: %u, izvori: %u, prioritet: %u, dostupno: %s)\n"
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2574,22 +2972,36 @@ msgid ", availability group: "
 msgstr ", dostupnost grupe: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktivni ulaz: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tVrste:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Neuspjelo dobivanje informacija izvora: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2628,20 +3040,36 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
 #: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
 #: src/utils/pactl.c:1624
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "n/a"
 msgstr "n/d"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Neuspjelo dobivanje informacija modula: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2658,12 +3086,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Neuspjelo dobivanje informacija klijenta: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2678,12 +3114,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Neuspjelo dobivanje informacija kartice: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2700,30 +3144,51 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfili:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (slivnici: %u, izvori: %u, prioritet: %u, dostupno: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktivni profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (vrsta: %s, prioritet: %u, pomak latencije: %<PRId64> usek%s%s, "
 "%s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2732,17 +3197,29 @@ msgstr ""
 "\t\t\tSvojstva:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tDio profila: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Neuspjelo dobivanje informacija ulaza slivnika: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2781,12 +3258,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Neuspjelo dobivanje informacija izvora izlaza: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2825,12 +3310,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Neuspjelo dobivanje informacija uzorka: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2859,11 +3352,41 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Neuspjeh: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "read() neuspjelo: %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2888,11 +3411,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr "list-handlers poruka odgovora polja elementa %d nije JSON objekt"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Neuspjelo uklanjanje modula: Modul %s nije učitan"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2910,11 +3438,74 @@ msgstr[2] ""
 "Neuspjelo postavljanje glasnoće zvuka: pokušali ste postaviti glasnoću zvuka "
 "za %d kanala, dok su kanal/i podržani = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Neuspjelo učitavanje uzorka: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Prerani kraj datoteke"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "novi"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "promijeni"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "ukloni"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "nepoznat"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "slivnik"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "izvor"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "slivnik-izlaz"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "izvor-izlaz"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klijent"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "uzorak-predmemorija"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "poslužitelj"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kartica"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Prerani kraj datoteke"
@@ -2972,10 +3563,78 @@ msgid "card"
 msgstr "kartica"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Događaj '%s' na %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT, izlazim."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Neispravan opis glasoće zvuka"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Glasnoća zvuka je izvan dopuštenog raspona.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Pogrešan broj specifikacija glasnoće zvuka.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Nedosljedna specifikacija glasnoće zvuka.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[mogućnosti]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[VRSTA]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NAZIV-DATOTEKE [NAZIV]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAZIV [SLIVNIK]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAZIV|#N GLASNOĆA ZVUKA [GLASNOĆA ZVUKA ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N GLASNOĆA ZVUKA [GLASNOĆA ZVUKA ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAZIV|#N 1|0|prebacivanje"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|prebacivanje"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATI"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT, izlazim."
@@ -3041,6 +3700,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATI"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3051,7 +3711,11 @@ msgstr ""
 "Posebni nazivi @DEFAULT_SINK@, @DEFAULT_SOURCE@ i @DEFAULT_MONITOR@\n"
 "mogu se koristiti za određivanje zadanog slivnika, izvora i nadgledanja.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3076,7 +3740,11 @@ msgstr ""
 "  -n, --client-name=NAZIV                Kako nazvati ovaj klijent na "
 "poslužitelju\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3087,16 +3755,59 @@ msgstr ""
 "Kompilirano s libpulse %s\n"
 "Povezano s libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Neispravna vrijednost formata '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Ne određuj ništa, ili jedan od: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Odredi datoteku uzorka za učitavanje"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Neuspjelo otvaranje datoteke zvuka."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Upozorenje: neuspjelo otkrivanje specifikacija uzorka iz datoteke."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Morate odrediti naziv uzorka za reprodukciju"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Morate odrediti naziv uzorka za uklanjanje"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Morate odrediti sadržaj ulaza slivnika i slivnik"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Morate odrediti sadržaj izlaza izvora i izvor"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Morate odrediti naziv modula i argumente."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Morate odrediti sadržaj modula ili naziv"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Odredi datoteku uzorka za učitavanje"
@@ -3134,17 +3845,26 @@ msgid "You have to specify a module index or name"
 msgstr "Morate odrediti sadržaj modula ili naziv"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Možda niste odredili više od jednog slivnika. Morate odrediti boolean "
 "vrijednosti."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Neispravna specifikacija suspendiranja."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Neispravna specifikacija suspendiranja."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3152,22 +3872,50 @@ msgstr ""
 "Možda niste odredili više od jednog izvora. Morate odrediti boolean "
 "vrijednosti."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+=======
 #: src/utils/pactl.c:2939
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Morate odrediti naziv/sadržaj kartice i naziv profila"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2138
+=======
 #: src/utils/pactl.c:2950
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name/index and a port name"
 msgstr "Morate odrediti naziv/sadržaj slivnika i naziv ulaza"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Morate odrediti naziv slivnika"
+
+#: src/utils/pactl.c:2162
+=======
 #: src/utils/pactl.c:2961
 msgid "You have to specify a sink name"
 msgstr "Morate odrediti naziv slivnika"
 
 #: src/utils/pactl.c:2974
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source name/index and a port name"
 msgstr "Morate odrediti naziv/sadržaj izvora i naziv ulaza"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Morate odrediti naziv izvora"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Morate odrediti naziv slivnika"
+
+#: src/utils/pactl.c:2196
+=======
 #: src/utils/pactl.c:2985
 msgid "You have to specify a source name"
 msgstr "Morate odrediti naziv izvora"
@@ -3177,17 +3925,46 @@ msgid "You have to specify a sink name/index"
 msgstr "Morate odrediti naziv/sadržaj slivnika"
 
 #: src/utils/pactl.c:3008
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Morate odrediti naziv/sadržaj slivnika i glasnoću zvuka"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Morate odrediti naziv izvora"
+
+#: src/utils/pactl.c:2219
+=======
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
 msgid "You have to specify a source name/index"
 msgstr "Morate odrediti naziv/sadržaj izvora"
 
 #: src/utils/pactl.c:3031
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source name/index and a volume"
 msgstr "Morate odrediti naziv/sadržaj izvora i glasnoću zvuka"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Morate odrediti sadržaj ulaza slivnika i glasnoću zvuka"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Neispravan sadržaj ulaza slivnika"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Morate odrediti sadržaj izlaza izvora i glasanoću zvuka"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Neispravan sadržaj izlaza izvora"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3044
 msgid "You have to specify a sink input index and a volume"
 msgstr "Morate odrediti sadržaj ulaza slivnika i glasnoću zvuka"
@@ -3205,36 +3982,58 @@ msgid "Invalid source output index"
 msgstr "Neispravan sadržaj izlaza izvora"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Morate odrediti naziv/sadržaj slivnika i radnju utišavanja (0, 1, ili "
 "'prebacivanje')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Neispravne specifikacije utišavanja"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Neispravne specifikacije utišavanja"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Morate odrediti naziv/sadržaj izvora i radnju utišavanja (0, 1, ili "
 "'prebacivanje')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Morate odrediti naziv sadržaj ulaza slivnika i radnju utišavanja (0, 1, ili "
 "'prebacivanje')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Neispravna specifikacija sadržaja ulaza slivnika"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Neispravna specifikacija sadržaja ulaza slivnika"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3242,6 +4041,18 @@ msgstr ""
 "Morate odrediti sadržaj izlaza izvora i radnju utišavanja (0, 1, ili "
 "'prebacivanje')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Neispravna specifikacija sadržaja izlaza izvora"
+
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "Morate odrediti naziv slivnika/sadržaj i naziv ulaza"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Neispravna specifikacija sadržaja izlaza izvora"
@@ -3251,14 +4062,20 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Morate odrediti bar putanju objekta i naziv poruke"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Višak argumenata je naveden, biti će zanemareni. Zapamtite da svi parametri "
 "poruke moraju biti navedeni kao jedan niz."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3266,15 +4083,27 @@ msgstr ""
 "Morate odrediti sadržaj slivnika i popis podržanih formata odvojenih točka-"
 "zarezom"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Morate odrediti naziv/sadržaj kartice, naziv ulaza i pomak latencije"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Nemoguća obrada pomaka latencije"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Nemoguća obrada pomaka latencije"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Nema određenih valjanih naredbi."
 
@@ -3440,6 +4269,7 @@ msgstr "Još nije implementirano.\n"
 
 #~ msgid "LFE on Separate Mono Output"
 #~ msgstr "(LFE) Efekti niske frekvencije na odvojenom mono izlazu"
+<<<<<<< HEAD
 
 #~ msgid "Digital Passthrough (S/PDIF)"
 #~ msgstr "Digitalni prolaz (S/PDIF)"
@@ -3447,6 +4277,15 @@ msgstr "Još nije implementirano.\n"
 #~ msgid "Digital Passthrough (IEC958)"
 #~ msgstr "Digitalni prolaz (IEC958)"
 
+=======
+
+#~ msgid "Digital Passthrough (S/PDIF)"
+#~ msgstr "Digitalni prolaz (S/PDIF)"
+
+#~ msgid "Digital Passthrough (IEC958)"
+#~ msgstr "Digitalni prolaz (IEC958)"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #~ msgid "Failed to initialize daemon."
 #~ msgstr "Neuspjelo pokretanje pozadinskog programa."
 
diff --git a/po/hu.po b/po/hu.po
index 040836e9e..6cd0e9d34 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,8 +10,13 @@ msgstr ""
 "Project-Id-Version: PulseAudio master\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2020-07-21 15:29+0000\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-08-09 21:19+0000\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Last-Translator: Balázs Meskó <meskobalazs@mailbox.org>\n"
 "Language-Team: Hungarian <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/hu/>\n"
@@ -20,13 +25,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.1.1\n"
+=======
 "X-Generator: Weblate 4.13\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: src/daemon/cmdline.c:113
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "\n"
@@ -215,6 +228,10 @@ msgid "--use-pid-file expects boolean argument"
 msgstr "a --use-pid-file paraméter logikai értéket vár"
 
 #: src/daemon/cmdline.c:328
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
 "valid file name 'file:<path>', 'newfile:<path>'."
@@ -569,6 +586,21 @@ msgstr "A „pa_pid_file_create()” függvényhívás meghiúsult."
 #: src/daemon/main.c:1193
 msgid "pa_core_new() failed."
 msgstr "A pa_core_new() sikertelen."
+<<<<<<< HEAD
+
+#: src/daemon/main.c:1268
+#, fuzzy
+msgid "command line arguments"
+msgstr "Túl sok argumentum."
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+=======
 
 #: src/daemon/main.c:1268
 msgid "command line arguments"
@@ -583,6 +615,7 @@ msgstr ""
 "Nem sikerült inicializálni a démont az indítási parancsok végrehajtása "
 "közbeni hibák miatt. A parancsok forrása: %s"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr ""
@@ -618,7 +651,11 @@ msgid "Line In"
 msgstr "Vonalbemenet"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -639,12 +676,20 @@ msgid "Internal Microphone"
 msgstr "Belső mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Rádió"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Videó"
 
@@ -681,12 +726,20 @@ msgid "No Bass Boost"
 msgstr "Nincs basszuskiemelés"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Hangszóró"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Analóg fejhallgató"
 
@@ -707,6 +760,17 @@ msgid "Analog Output"
 msgstr "Analóg kimenet"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Analóg fejhallgató"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+#, fuzzy
+msgid "Headphones Mono Output"
+msgstr "Analóg mono kimenet"
+
+=======
 msgid "Headphones 2"
 msgstr "2. fejhallgató"
 
@@ -714,6 +778,7 @@ msgstr "2. fejhallgató"
 msgid "Headphones Mono Output"
 msgstr "Fejhallgató monó kimenete"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:2810
 msgid "Line Out"
 msgstr "Vonalkimenet"
@@ -747,6 +812,26 @@ msgid "Multichannel Output"
 msgstr "Többcsatornás kimenet"
 
 #: src/modules/alsa/alsa-mixer.c:2818
+<<<<<<< HEAD
+#, fuzzy
+msgid "Game Output"
+msgstr "%s kimenet"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "%s kimenet"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "%s bemenet"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Virtuális térhatású nyelő"
+=======
 msgid "Game Output"
 msgstr "Játék kimenet"
 
@@ -761,6 +846,7 @@ msgstr "Csevegés bemenete"
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "Virtuális 7.1-es térhatású"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
@@ -774,6 +860,16 @@ msgstr "Analóg monó (Bal)"
 msgid "Analog Mono (Right)"
 msgstr "Analóg monó (Jobb)"
 
+#: src/modules/alsa/alsa-mixer.c:4564
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Analóg mono"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Analóg mono"
+
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
 #. * here would lead to the source name to become "Analog Stereo Input
@@ -787,20 +883,34 @@ msgstr "Analóg sztereó"
 #: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
 #: src/pulse/channelmap.c:770
 msgid "Mono"
+<<<<<<< HEAD
+msgstr "Mono"
+=======
 msgstr "Monó"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
 msgid "Stereo"
 msgstr "Sztereó"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Fejhallgató"
 
 #: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+<<<<<<< HEAD
+#, fuzzy
+msgid "Speakerphone"
+msgstr "Hangszóró"
+=======
 msgid "Speakerphone"
 msgstr "Kihangosító"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -876,11 +986,19 @@ msgstr "Digitális 5.1-es térhatású (HDMI)"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+=======
 msgstr "Csevegés"
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
 msgstr "Játék"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4732
 msgid "Analog Mono Duplex"
@@ -899,6 +1017,18 @@ msgid "Multichannel Duplex"
 msgstr "Többcsatornás duplex"
 
 #: src/modules/alsa/alsa-mixer.c:4738
+<<<<<<< HEAD
+#, fuzzy
+msgid "Stereo Duplex"
+msgstr "Analóg sztereó duplex"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 msgid "Stereo Duplex"
 msgstr "Sztereó kétirányú"
 
@@ -908,6 +1038,7 @@ msgstr "Monó csevegés + 7.1-es térhatású"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Kikapcsolva"
 
@@ -921,7 +1052,11 @@ msgstr "%s kimenet"
 msgid "%s Input"
 msgstr "%s bemenet"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -939,7 +1074,11 @@ msgstr ""
 "„snd_pcm_avail()” függvény visszatérési értéke 0 vagy a min_avail-nál kisebb "
 "más érték volt."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -958,7 +1097,11 @@ msgstr ""
 "más érték volt."
 
 #: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
 "ms).\n"
@@ -981,7 +1124,11 @@ msgstr[1] ""
 "ezt a problémát az ALSA fejlesztői felé."
 
 #: src/modules/alsa/alsa-util.c:1249
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
 "%lu ms).\n"
@@ -1017,7 +1164,11 @@ msgstr ""
 "ezt a problémát az ALSA fejlesztői felé."
 
 #: src/modules/alsa/alsa-util.c:1339
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
 "(%lu ms).\n"
@@ -1039,6 +1190,16 @@ msgstr[1] ""
 "Ez valószínűleg egy hiba eredménye az ALSA „%s” illesztőprogramban. Jelentse "
 "ezt a problémát az ALSA fejlesztői felé."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth bemenet"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1047,10 +1208,64 @@ msgstr "Bluetooth bemenet"
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Bluetooth Output"
 msgstr "Bluetooth kimenet"
 
 # FIXME: utánanézni
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Kihangosító"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Fülhallgató"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Hordozható"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Autó"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Hi-Fi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Hi-Fi lejátszás (A2DP bemenet)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Hi-Fi felvétel (A2DP forrás)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Fejhallgató fejegység (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Fejhallgató hangátjáró (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Fejhallgató fejegység (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Fejhallgató hangátjáró (HSP/HFP)"
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr "Kihangosító"
@@ -1098,6 +1313,7 @@ msgstr "Fejhallgató fejegység (HFP)"
 #: src/modules/bluetooth/module-bluez5-device.c:2105
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Kihangosító hangátjáró (HFP)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
@@ -1139,10 +1355,17 @@ msgstr ""
 "Mindig maradjon betöltve legalább egy nyelő, még ha az csak az üres nyelő is"
 
 #: src/modules/module-always-source.c:35
+<<<<<<< HEAD
+#, fuzzy
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr ""
+"Mindig maradjon betöltve legalább egy nyelő, még ha az csak az üres nyelő is"
+=======
 msgid "Always keeps at least one source loaded even if it's a null one"
 msgstr ""
 "Mindig maradjon betöltve legalább egy forrás, még ha az csak az üres forrás "
 "is"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-equalizer-sink.c:68
 msgid "General Purpose Equalizer"
@@ -1161,11 +1384,19 @@ msgstr ""
 "channel_map=<csatornaleképzés> autoloaded=<beállítva, ha ez a modul "
 "automatikusan betöltődik> use_volume_sharing=<igen vagy nem> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr ""
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr "FFT alapú hangszínszabályzó ezen: %s"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-filter-apply.c:47
 msgid "autoclean=<automatically unload unused filters?>"
@@ -1176,6 +1407,10 @@ msgid "Virtual LADSPA sink"
 msgstr "Látszólagos LADSPA nyelő"
 
 #: src/modules/module-ladspa-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "sink_input_properties=<properties for the sink input> master=<name of sink "
@@ -1194,18 +1429,30 @@ msgstr ""
 "control=<bemenetszabályzó értékek vesszővel elválasztott listája> "
 "input_ladspaport_map=<bemeneti LADSPA portnevek vesszővel elválasztott "
 "listája> output_ladspaport_map=<kimeneti LADSPA portnevek vesszővel "
+<<<<<<< HEAD
+"elválasztott listája> "
+=======
 "elválasztott listája> autoloaded=<állítsa be ha a modul automatikusan "
 "töltődik be> "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-null-sink.c:46
 msgid "Clocked NULL sink"
 msgstr "Órajelezett NULL nyelő"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "NULL kimenet"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "NULL kimenet"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Nem sikerült beállítani a formátumot: érvénytelen formátumleírás: %s"
@@ -1228,14 +1475,24 @@ msgstr "Hangok ezen a számítógépen: @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Alagút ennek: %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Alagút ehhez: %s/%s"
@@ -1245,6 +1502,10 @@ msgid "Virtual surround sink"
 msgstr "Virtuális térhatású nyelő"
 
 #: src/modules/module-virtual-surround-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1265,9 +1526,20 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Ismeretlen eszközmodell"
 
+<<<<<<< HEAD
+#: src/modules/raop/module-raop-discover.c:295
+#, fuzzy
+msgid "Unknown device model"
+msgstr "Ismeretlen hibakód"
+
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr "Szabványos RAOP-profil"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
@@ -1476,7 +1748,10 @@ msgstr "Felső hátsó jobb"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(Érvénytelen)"
 
@@ -1544,7 +1819,11 @@ msgid "invalid"
 msgstr "érvénytelen"
 
 #: src/pulsecore/core-util.c:1790
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 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, "
@@ -1584,11 +1863,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Érvénytelen naplózási cél."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Belső hangforrás"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Belső hangforrás"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1869,7 +2156,11 @@ msgstr "Nem sikerült beállítani az adatfolyam megfigyelését: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "A „pa_stream_connect_record()” függvényhívás meghiúsult: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Kapcsolódási hiba: %s"
@@ -1908,7 +2199,11 @@ msgid "pa_stream_update_timing_info() failed: %s"
 msgstr "A „pa_stream_update_timing_info()” függvényhívás meghiúsult: %s"
 
 #: src/utils/pacat.c:676
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "%s\n"
@@ -2078,7 +2373,11 @@ msgstr ""
 "Lefordítva a libpulse %s programkönyvtárral\n"
 "Összeszerkesztve a libpulse %s programkönyvtárhoz\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Érvénytelen kliensnév: „%s”"
@@ -2151,7 +2450,11 @@ msgstr ""
 "Figyelmeztetés: a megadott mintavételi meghatározás felül lesz írva a "
 "fájlból származó meghatározással."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Nem sikerült meghatározni a mintavételi meghatározást a fájlból."
 
@@ -2188,7 +2491,11 @@ msgstr "lejátszás"
 msgid "Failed to set media name."
 msgstr "Nem sikerült beállítani a médianevet."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "A „pa_mainloop_new()” függvényhívás meghiúsult."
 
@@ -2196,11 +2503,19 @@ msgstr "A „pa_mainloop_new()” függvényhívás meghiúsult."
 msgid "io_new() failed."
 msgstr "Az „io_new()” függvényhívás meghiúsult."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "A „pa_context_new()” függvényhívás meghiúsult."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "A „pa_context_new()” függvényhívás meghiúsult."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "A „pa_context_connect()” függvényhívás meghiúsult: %s"
@@ -2209,6 +2524,23 @@ msgstr "A „pa_context_connect()” függvényhívás meghiúsult: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "A „pa_context_rttime_new()” függvényhívás meghiúsult."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "A „pa_mainloop_run()” függvényhívás meghiúsult."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NÉV [ARGUMENTUMOK …]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NÉV|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "A „pa_mainloop_run()” függvényhívás meghiúsult."
@@ -2224,6 +2556,7 @@ msgstr "NÉV|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NÉV"
 
@@ -2235,7 +2568,11 @@ msgstr "NÉV|#N HANGERŐ"
 msgid "#N VOLUME"
 msgstr "#N HANGERŐ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NÉV|#N 1|0"
 
@@ -2271,7 +2608,11 @@ msgstr "ÚTVONALNÉV"
 msgid "FILENAME SINK|#N"
 msgstr "FÁJLNÉV NYELŐ|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N NYELŐ|FORRÁS"
 
@@ -2279,6 +2620,17 @@ msgstr "#N NYELŐ|FORRÁS"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KÁRTYAPROFIL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NÉV|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KÁRTYAPROFIL"
@@ -2288,6 +2640,7 @@ msgid "NAME|#N PORT"
 msgstr "NÉV|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "KÁRTYANÉV|KÁRTYA-#N PORTELTOLÁS"
 
@@ -2303,9 +2656,15 @@ msgstr "SZÁMOZOTT-SZINT"
 msgid "FRAMES"
 msgstr "KERETEK"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "CÍMZETT ÜZENET [MESSAGE_PARAMETERS]"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:82
 #, c-format
@@ -2368,20 +2727,34 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Nem sikerült a statisztika lekérdezése: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:199
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Jelenleg használt: %u blokk, összesen %s bájt tartalommal.\n"
 msgstr[1] "Jelenleg használt: %u blokk, összesen %s bájt tartalommal.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:205
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
@@ -2390,22 +2763,39 @@ msgstr[0] ""
 msgstr[1] ""
 "A futás során összesen lefoglalva: %u blokk, összesen %s bájt tartalommal.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Mintagyorsítótár mérete: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Nem sikerült lekérni a kiszolgáló adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2422,7 +2812,11 @@ msgstr ""
 "Kliensindex: %u\n"
 "Csempeméret: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2445,6 +2839,79 @@ msgstr ""
 "Alapértelmezett forrás: %s\n"
 "Süti: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "ismeretlen"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "Vonalbemenet"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+#, fuzzy
+msgid "Handset"
+msgstr "Fejhallgató"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+#, fuzzy
+msgid "Bluetooth"
+msgstr "Bluetooth bemenet"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Analóg mono"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "elérhetőség ismeretlen"
@@ -2511,11 +2978,16 @@ msgstr "Analóg"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Nem sikerült lekérni a nyelő adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2554,11 +3026,27 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortok:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, fuzzy, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr "\t\t%s: %s (nyelők: %u, források: %u, prioritás: %u, elérhető: %s)\n"
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2569,22 +3057,36 @@ msgid ", availability group: "
 msgstr ", elérhetőségi csoport: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktív port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormátumok:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Nem sikerült lekérni a forrás adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2623,6 +3125,17 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "---"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2632,11 +3145,16 @@ msgid "n/a"
 msgstr "---"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Nem sikerült lekérni a modul adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2653,12 +3171,20 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Nem sikerült lekérni a kliens adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2673,12 +3199,20 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Nem sikerült lekérni a kártya adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2695,30 +3229,51 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfilok:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (nyelők: %u, források: %u, prioritás: %u, elérhető: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktív profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (típus: %s, prioritás: %u, késleltetési eltolás: %<PRId64> "
 "usec%s%s, %s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2727,17 +3282,29 @@ msgstr ""
 "\t\t\tTulajdonságok:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tProfilok része: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Nem sikerült lekérni a nyelő bemeneti adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2776,12 +3343,20 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Nem sikerült lekérni a forrás kimeneti adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2820,12 +3395,20 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Nem sikerült lekérni a mintavétel adatait: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2854,11 +3437,41 @@ msgstr ""
 "\tTulajdonságok:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Hiba: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "a read() hívás meghiúsult: %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2883,12 +3496,18 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr "list-handlers üzenetválasz tömb eleme: %d nem JSON-objektum"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Nem sikerült eltávolítani a modult: nincs betöltve %s nevű modul"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:1818
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
 "channel(s) supported = %d\n"
@@ -2902,11 +3521,74 @@ msgstr[1] ""
 "Nem sikerült a hangerő beállítása: kísérlet %d csatorna hangerejének "
 "beállítására, miközben a támogatott csatornák száma %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Nem sikerült feltölteni a mintát: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Túl korai fájlvég"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "új"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "módosítás"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "eltávolítás"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "ismeretlen"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "nyelő"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "forrás"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "nyelő-bemenet"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "forrás-kimenet"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "kliens"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "mintagyorsítótár"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "kiszolgáló"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kártya"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Túl korai fájlvég"
@@ -2964,10 +3646,78 @@ msgid "card"
 msgstr "kártya"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "„%1$s” esemény ezen: %3$u. %2$s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Kilépés, SIGINT szignál hatására."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "A hangerő megadása érvénytelen"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "A hangerő a megengedett tartományon kívül esik.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "A hangerőmegadások száma érvénytelen.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "A hangerő megadása inkonzisztens.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[kapcsolók]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TÍPUS]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "FÁJLNÉV [NÉV]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NÉV [NYELŐ]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NÉV|#N HANGERŐ [HANGERŐ …]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N HANGERŐ [HANGERŐ …]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NÉV|#N 1|0|váltás"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|váltás"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMÁTUMOK"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Kilépés, SIGINT szignál hatására."
@@ -3033,6 +3783,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMÁTUMOK"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3043,7 +3794,11 @@ msgstr ""
 "A speciális @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@ nevek\n"
 "használhatók az alapértelmezett nyelő, forrás és megfigyelő megadására.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3061,12 +3816,19 @@ msgstr ""
 "  -h, --help                            Ezen súgó megjelenítése\n"
 "      --version                         Verziószám megjelenítése\n"
 "\n"
+<<<<<<< HEAD
+"  -s, --server=KISZOLGÁLÓ               Csatlakozás ehhez a kiszolgálóhoz\n"
+"  -n, --client-name=NÉV                 A kliens neve a kiszolgálón\n"
+
+#: src/utils/pactl.c:1909
+=======
 "  -f, --format=FORMAT                   A kimenet formátuma. „normal” vagy "
 "„json”.\n"
 "  -s, --server=KISZOLGÁLÓ               Csatlakozás ehhez a kiszolgálóhoz\n"
 "  -n, --client-name=NÉV                 A kliens neve a kiszolgálón\n"
 
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3077,16 +3839,31 @@ msgstr ""
 "Lefordítva a libpulse %s programkönyvtárral\n"
 "Összeszerkesztve a libpulse %s programkönyvtárhoz\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Érvénytelen formátumérték: „%s”"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Ne adjon meg semmit, vagy a következők egyikét: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Adja meg a betöltendő mintafájlt"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Nem sikerült megnyitni a hangfájlt."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Adja meg a betöltendő mintafájlt"
@@ -3096,11 +3873,23 @@ msgid "Failed to open sound file."
 msgstr "Nem sikerült megnyitni a hangfájlt."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Figyelmeztetés: Nem sikerült meghatározni a mintavételi meghatározást a "
 "fájlból."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Meg kell adnia a lejátszandó minta nevét"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Meg kell adnia az eltávolítandó minta nevét"
+
+#: src/utils/pactl.c:2032
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Meg kell adnia a lejátszandó minta nevét"
@@ -3110,36 +3899,118 @@ msgid "You have to specify a sample name to remove"
 msgstr "Meg kell adnia az eltávolítandó minta nevét"
 
 #: src/utils/pactl.c:2844
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink input index and a sink"
 msgstr "Meg kell adnia egy nyelőbemenet tárgymutatót és egy nyelőt"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2042
+=======
 #: src/utils/pactl.c:2854
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a source"
 msgstr "Meg kell adnia egy forráskimenet tárgymutatót és egy forrást"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Meg kell adnia a modul nevét és argumentumait."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2869
 msgid "You have to specify a module name and arguments."
 msgstr "Meg kell adnia a modul nevét és argumentumait."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a module index or name"
 msgstr "Meg kell adnia a modul tárgymutatóját vagy nevét"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "Nem adhat meg egynél több nyelőt. Egy logikai értéket kell megadnia."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Érvénytelen felfüggesztési meghatározás."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Érvénytelen felfüggesztési meghatározás."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "Nem adhat meg egynél több forrást. Egy logikai értéket kell megadnia."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Meg kell adnia a kártya nevét vagy indexét és egy profil nevét"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Meg kell adnia a nyelő nevét vagy indexét, és egy port nevét"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Meg kell adnia egy nyelő nevét"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Meg kell adnia egy forrás nevét vagy indexét, és egy port nevét"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Meg kell adnia egy forrás nevét"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Meg kell adnia egy nyelő nevét"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Meg kell adnia egy nyelő nevét vagy indexét és egy hangerőt"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Meg kell adnia egy forrás nevét"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Meg kell adnia egy forrás nevét vagy indexét és egy hangerőt"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Meg kell adnia egy nyelő bemenet indexét és egy hangerőt"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "A nyelőbemenet indexe érvénytelen"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Meg kell adnia egy forráskimenet indexét és egy hangerőt"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "A nyelőkimenet indexe érvénytelen"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Meg kell adnia a kártya nevét vagy indexét és egy profil nevét"
@@ -3193,36 +4064,58 @@ msgid "Invalid source output index"
 msgstr "A nyelőkimenet indexe érvénytelen"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Meg kell adnia egy nyelő nevét vagy indexét, és a némítási műveletet (0, 1 "
 "vagy „toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Érvénytelen némításmeghatározás"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Érvénytelen némításmeghatározás"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Meg kell adnia egy forrás nevét vagy indexét, és a némítási műveletet (0, 1 "
 "vagy „toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Meg kell adnia egy nyelő bemeneti indexét, és a némítási műveletet (0, 1 "
 "vagy „toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "A nyelő bemeneti indexének megadása érvénytelen"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "A nyelő bemeneti indexének megadása érvénytelen"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3230,6 +4123,18 @@ msgstr ""
 "Meg kell adnia egy forráskimenet indexét, és a némítási műveletet (0, 1 vagy "
 "„toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "A forrás bemeneti indexének megadása érvénytelen"
+
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "Meg kell adnia a nyelő nevét vagy indexét, és egy port nevét"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "A forrás bemeneti indexének megadása érvénytelen"
@@ -3239,15 +4144,21 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Meg kell adnia legalább egy objektumútvonalat és egy üzenetnevet"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Túl sok argumentum lett megadva, figyelmen kívül lesznek hagyva. Vegye "
 "figyelembe, hogy az üzenetparamétereket egyetlen karakterláncban kell "
 "megadni."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3255,17 +4166,29 @@ msgstr ""
 "Meg kell adnia egy nyelő indexét és a támogatott formátumok pontosvesszővel "
 "elválasztott listáját"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Meg kell adnia egy kártya nevét vagy indexét, egy port nevét és egy "
 "késleltetéseltolást"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Nem dolgozható fel a késleltetéseltolás"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Nem dolgozható fel a késleltetéseltolás"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Érvénytelen parancs lett megadva."
 
@@ -3311,7 +4234,11 @@ msgstr ""
 "FIGYELMEZTETÉS: A gyermek folyamat a következő szignállal fejeződött be: %u\n"
 
 #: src/utils/pasuspender.c:228
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options] -- PROGRAM [ARGUMENTS ...]\n"
 "\n"
diff --git a/po/id.po b/po/id.po
index d4967aade..26468cee7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,11 +9,18 @@ msgstr ""
 "Project-Id-Version: PulseAudio master\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2018-03-04 15:20+0700\n"
+"Last-Translator: Andika Triwidada <atriwidada@gnome.org>\n"
+"Language-Team: Indonesia <id@li.org>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2021-09-24 12:05+0000\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/id/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -179,7 +186,10 @@ msgid "--fail expects boolean argument"
 msgstr "--fail mengharapkan argumen bool"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+=======
 #, fuzzy
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
@@ -208,6 +218,10 @@ msgid "--use-pid-file expects boolean argument"
 msgstr "--use-pid-file mengharapkan argumen bool"
 
 #: src/daemon/cmdline.c:328
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
 "valid file name 'file:<path>', 'newfile:<path>'."
@@ -554,6 +568,19 @@ msgid "pa_core_new() failed."
 msgstr "pa_core_new() gagal."
 
 #: src/daemon/main.c:1268
+<<<<<<< HEAD
+#, fuzzy
+msgid "command line arguments"
+msgstr "Terlalu banyak argumen."
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+=======
 msgid "command line arguments"
 msgstr "argumen baris perintah"
 
@@ -566,6 +593,7 @@ msgstr ""
 "Gagal menginisialisasi daemon karena kesalahan saat mengeksekusi perintah "
 "awal mula. Sumber perintah: %s"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr "Daemon dimulai tanpa modul apapun yang dimuat, menolak bekerja."
@@ -601,7 +629,11 @@ msgid "Line In"
 msgstr "Jalur Masuk"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -622,12 +654,20 @@ msgid "Internal Microphone"
 msgstr "Mikrofon Internal"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -664,12 +704,20 @@ msgid "No Bass Boost"
 msgstr "Tanpa Boost Bass"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Speaker"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Headphone"
 
@@ -678,6 +726,10 @@ msgid "Analog Input"
 msgstr "Masukan Analog"
 
 #: src/modules/alsa/alsa-mixer.c:2800
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Dock Microphone"
 msgstr "Mikrofon Dok"
 
@@ -690,8 +742,14 @@ msgid "Analog Output"
 msgstr "Keluaran Analog"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Headphone"
+=======
 msgid "Headphones 2"
 msgstr "Headphone 2"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2809
 msgid "Headphones Mono Output"
@@ -736,6 +794,21 @@ msgid "Game Output"
 msgstr "Keluaran %s"
 
 #: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+<<<<<<< HEAD
+#, fuzzy
+msgid "Chat Output"
+msgstr "Keluaran %s"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "Masukan %s"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Muara virtual surround"
+=======
 msgid "Chat Output"
 msgstr "Keluaran Obrolan"
 
@@ -746,18 +819,30 @@ msgstr "Masukan Obrolan"
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "Virtual Surround 7.1"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Analog Mono"
 
 #: src/modules/alsa/alsa-mixer.c:4564
+<<<<<<< HEAD
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Analog Mono"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Analog Mono"
+=======
 msgid "Analog Mono (Left)"
 msgstr "Analog Mono (Kiri)"
 
 #: src/modules/alsa/alsa-mixer.c:4565
 msgid "Analog Mono (Right)"
 msgstr "Analog Mono (Kanan)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
@@ -779,13 +864,23 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Headset"
 
 #: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+<<<<<<< HEAD
+#, fuzzy
+msgid "Speakerphone"
+msgstr "Speaker"
+=======
 msgid "Speakerphone"
 msgstr "Speakerphone"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -861,11 +956,19 @@ msgstr "Surround 5.1 Digital (HDMI)"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+=======
 msgstr "Obrolan"
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
 msgstr "Permainan"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4732
 msgid "Analog Mono Duplex"
@@ -889,10 +992,17 @@ msgstr "Dupleks Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4739
 msgid "Mono Chat + 7.1 Surround"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 msgstr "Mono Chat + 7.1 Surround"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Mati"
 
@@ -906,7 +1016,11 @@ msgstr "Keluaran %s"
 msgid "%s Input"
 msgstr "Masukan %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -923,7 +1037,11 @@ msgstr ""
 "Kami dibangunkan dengan POLLOUT diset -- namun snd_pcm_avail() setelahnya "
 "mengembalikan 0 atau nilai lain < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1007,6 +1125,44 @@ msgstr[0] ""
 "Sangat mungkin ini adalah kutu pada driver ALSA '%s'. Silakan laporkan hal "
 "ini ke para pengembang ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Masukan Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Keluaran Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Handsfree"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Headphone"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portabel"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Mobil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telepon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1043,31 +1199,52 @@ msgid "Phone"
 msgstr "Telepon"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High Fidelity Playback (Muara A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "High Fidelity Capture (Sumber A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Head Unit (HSP)"
 msgstr "Headset Head Unit (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2079
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Audio Gateway (HSP)"
 msgstr "Headset Audio Gateway (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2092
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Head Unit (HFP)"
 msgstr "Headset Head Unit (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Headset Audio Gateway (HSP/HFP)"
@@ -1132,8 +1309,13 @@ msgstr ""
 "channels=<cacah kanal> channel_map=<peta kanal> autoloaded=<tata bila modul "
 "ini dimuat secara otomatis> use_volume_sharing=<yes atau no> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr "Ekualiser berbasis FFT pada %s"
@@ -1173,11 +1355,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Muara NULL dengan clock"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Keluaran Null"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Keluaran Null"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Gagal menata format: string format tak valid %s"
@@ -1200,14 +1390,24 @@ msgstr "Audio pada @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunnel untuk %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunnel ke %s/%s"
@@ -1217,6 +1417,10 @@ msgid "Virtual surround sink"
 msgstr "Muara virtual surround"
 
 #: src/modules/module-virtual-surround-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1227,18 +1431,29 @@ msgid ""
 "this module is being loaded automatically> "
 msgstr ""
 "sink_name=<nama bagi muara> sink_properties=<properti bagi muara> "
+<<<<<<< HEAD
+"master=<nama muara untuk disaring> format=<format cuplikan> rate=<laju "
+"cuplikan> channels=<cacah kanal> channel_map=<peta kanal> plugin=<nama "
+"plugin ladspa> label=<label plugin ladspa> control=<daftar nilai kendali "
+"masukan yang dipisahkan dengan koma>"
+=======
 "master=<nama muara untuk disaring> sink_master=<nama muara untuk disaring> "
 "format=<format cuplikan> rate=<laju cuplikan> channels=<cacah kanal> "
 "channel_map=<peta kanal> use_volume_sharing=<yes atau no> "
 "force_flat_volume=<yes atau no> hrir=/path/ke/left_hrir.wav hrir_left=/path/"
 "ke/left_hrir.wav hrir_right=/path/ke/opsional/right_hrir.wav "
 "autoloaded=<ditata bila modul ini dimuat secara otomatis> "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/raop/module-raop-discover.c:295
 msgid "Unknown device model"
 msgstr "Model peranti tak dikenal"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Profil standar RAOP"
 
@@ -1449,7 +1664,10 @@ msgstr "Puncak Belakang Kanan"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(tak valid)"
 
@@ -1509,6 +1727,10 @@ msgid "output"
 msgstr "keluaran"
 
 #: src/pulse/direction.c:41
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "bidirectional"
 msgstr "dua arah"
 
@@ -1517,7 +1739,11 @@ msgid "invalid"
 msgstr "tidak valid"
 
 #: src/pulsecore/core-util.c:1790
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 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, "
@@ -1557,11 +1783,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Target log tidak valid."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Audio Bawaan"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Audio Bawaan"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1837,7 +2071,11 @@ msgstr "Gagal menata stream pantau: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() gagal: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Kegagalan koneksi: %s"
@@ -2045,7 +2283,11 @@ msgstr ""
 "Dikompail dengan libpulse %s\n"
 "Ditaut dengan libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nama klien '%s' tak valid"
@@ -2118,7 +2360,11 @@ msgstr ""
 "Peringatan: spesifikasi cuplikan yang dinyatakan akan ditimpa oleh "
 "spesifikasi dari berkas."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Gagal menentukan spesifikasi cuplikan dari berkas."
 
@@ -2154,7 +2400,11 @@ msgstr "memainkan"
 msgid "Failed to set media name."
 msgstr "Gagal menata nama media."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() gagal."
 
@@ -2162,11 +2412,19 @@ msgstr "pa_mainloop_new() gagal."
 msgid "io_new() failed."
 msgstr "io_new() gagal."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() gagal."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() gagal."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() gagal: %s"
@@ -2175,6 +2433,23 @@ msgstr "pa_context_connect() gagal: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() gagal."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() gagal."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAMA [ARG ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAMA|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() gagal."
@@ -2190,6 +2465,7 @@ msgstr "NAMA|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAMA"
 
@@ -2201,7 +2477,11 @@ msgstr "NAMA|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAMA|#N 1|0"
 
@@ -2237,7 +2517,11 @@ msgstr "NAMAPATH"
 msgid "FILENAME SINK|#N"
 msgstr "NAMABERKAS MUARA|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N MUARA|SUMBER"
 
@@ -2245,6 +2529,17 @@ msgstr "#N MUARA|SUMBER"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PROFIL KARTU"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAMA|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PROFIL KARTU"
@@ -2254,6 +2549,7 @@ msgid "NAME|#N PORT"
 msgstr "NAMA|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NAMA-KARTU|KARTU-#N PORT OFSET"
 
@@ -2271,9 +2567,15 @@ msgstr "NUMERIC-LEVEL"
 msgid "FRAMES"
 msgstr "BINGKAI"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "PENERIMA PESAN [PARAMETER_PESAN]"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:82
 #, c-format
@@ -2339,41 +2641,72 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Gagal mendapat statistik: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:199
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Sedang dipakai: %u blok memuat total %s byte.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:205
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 "Dialokasikan dalam seluruh masa hidup: %u blok memuat total %s byte.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Ukuran singgahan cuplikan: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Gagal mendapat informasi server: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2390,7 +2723,11 @@ msgstr ""
 "Indeks Klien: %u\n"
 "Ukuran Ubin: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2413,6 +2750,30 @@ msgstr ""
 "Sumber Baku: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "tak dikenal"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "ketersediaan tak diketahui"
@@ -2434,10 +2795,58 @@ msgid "Aux"
 msgstr "Aux"
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Jalur Masuk"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+#, fuzzy
+msgid "Handset"
+msgstr "Headset"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+#, fuzzy
+msgid "Bluetooth"
+msgstr "Masukan Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Analog Mono"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr "Mik"
@@ -2480,11 +2889,16 @@ msgstr "Analog"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Gagal mendapat informasi muara: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2523,11 +2937,27 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "»Port:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, fuzzy, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr "\t\t%s: %s (muara: %u, sumber: %u, prioritas: %u, tersedia: %s)\n"
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2538,22 +2968,36 @@ msgid ", availability group: "
 msgstr ", grup ketersediaan: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "»Port Aktif: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormat:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Gagal mendapat informasi sumber: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2592,6 +3036,17 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "t/t"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2601,11 +3056,16 @@ msgid "n/a"
 msgstr "t/t"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Gagal mendapat informasi modul: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2622,12 +3082,20 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Gagal mendapat informasi klien: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2642,12 +3110,20 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Gagal mendapat informasi kartu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2664,29 +3140,50 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfil:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (muara: %u, sumber: %u, prioritas: %u, tersedia: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tProfil Aktif: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (tipe: %s, prioritas: %u, ofset latensi: %<PRId64> udtk%s%s, %s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2695,17 +3192,29 @@ msgstr ""
 "\t\t\tProperti:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tBagian dari profil: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Gagal mendapat informasi masukan muara: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2744,12 +3253,20 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Gagal mendapat informasi keluaran sumber: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2788,12 +3305,20 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Gagal mendapat informasi cuplikan: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2822,11 +3347,41 @@ msgstr ""
 "\tProperti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Kegagalan: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "read() gagal: %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2851,12 +3406,18 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr "elemen larik respon pesan penangan-pesan %d bukan suatu objek JSON"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Gagal membongkar modul: Modul %s tak dimuat"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:1818
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
 "channel(s) supported = %d\n"
@@ -2867,11 +3428,74 @@ msgstr[0] ""
 "Gagal menata volume: Anda mencoba menata volume untuk %d kanal, padahal "
 "kanal yang didukung = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Gagal mengunggah cuplikan: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Akhir berkas dini"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "baru"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "ubah"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "hapus"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "tak dikenal"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "muara"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "sumber"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "masukan-muara"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "sumber-keluaran"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klien"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "singgahan-cuplikan"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kartu"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Akhir berkas dini"
@@ -2929,10 +3553,78 @@ msgid "card"
 msgstr "kartu"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Kejadian '%s' pada %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Mendapat SIGINT, keluar."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Spesifikasi volume tak valid"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volume di luar rentang yang diizinkan.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Banyaknya spesifikasi volume tidak valid.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Spesifikasi volume tidak konsisten.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opsi]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPE]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NAMABERKAS [NAMA]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAMA [MUARA]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAMA|#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAMA|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMAT"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Mendapat SIGINT, keluar."
@@ -2998,6 +3690,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMAT"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3008,8 +3701,13 @@ msgstr ""
 "Nama-nama khusus @DEFAULT_SINK@, @DEFAULT_SOURCE@, dan @DEFAULT_MONITOR@\n"
 "dapat dipakai untuk menyatakan muara, sumber, dan pemantau baku.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3030,7 +3728,11 @@ msgstr ""
 "  -n, --client-name=NAMA                Bagaimana memanggil klien ini pada "
 "server\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3041,16 +3743,59 @@ msgstr ""
 "Dikompail dengan libpulse %s\n"
 "Ditaut dengan libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Nama stream '%s' tak valid"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Jangan nyatakan apapun, atau satu dari: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Nyatakan berkas cuplikan untuk dimuat"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Gagal membuka berkas suara."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Peringatan: Gagal menentukan spesifikasi cuplikan dari berkas."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Anda mesti menyatakan nama cuplikan untuk diputar"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Anda mesti menyatakan nama cuplikan untuk dihapus"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Anda mesti menyatakan suatu indeks masukan muara dan suatu muara"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Anda mesti menyatakan suatu indeks keluaran sumber dan suatu sumber"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Anda mesti menyatakan nama modul dan argumen."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Anda mesti menyatakan suatu nama atau indeks modul"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Nyatakan berkas cuplikan untuk dimuat"
@@ -3088,17 +3833,26 @@ msgid "You have to specify a module index or name"
 msgstr "Anda mesti menyatakan suatu nama atau indeks modul"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Anda tak boleh menyatakan lebih dari satu muara. Anda mesti menyatakan suatu "
 "nilai bool."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Spesifikasi suspensi tak valid."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Spesifikasi suspensi tak valid."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3106,6 +3860,63 @@ msgstr ""
 "Anda tak boleh menyatakan lebih dari satu sumber. Anda mesti menyatakan "
 "suatu nilai bool."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Anda mesti menyatakan suatu indeks/nama kartu dan suatu nama profil"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Anda mesti menyatakan suatu indeks/nama muara dan suatu nama port"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Anda mesti menyatakan suatu nama muara"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Anda mesti menyatakan suatu indeks/nama sumber dan suatu nama port"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Anda mesti menyatakan suatu nama sumber"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Anda mesti menyatakan suatu nama muara"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Anda mesti menyatakan suatu indeks/nama muara dan suatu volume"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Anda mesti menyatakan suatu nama sumber"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Anda mesti menyatakan suatu indeks/nama sumber dan suatu volume"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Anda mesti menyatakan suatu indeks masukan muara dan suatu volume"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Indeks masukan muara tak valid"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Anda mesti menyatakan suatu indeks keluaran sumber dan suatu volume"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Indeks keluaran sumber yang tak valid"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Anda mesti menyatakan suatu indeks/nama kartu dan suatu nama profil"
@@ -3159,36 +3970,58 @@ msgid "Invalid source output index"
 msgstr "Indeks keluaran sumber yang tak valid"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Anda harus menyatakan suatu nama muara/indeks dan suatu aksi bisu (0, 1, "
 "atau 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Spesifikasi bisu tak valid"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Spesifikasi bisu tak valid"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Anda harus menyatakan suatu nama sumber/indeks dan suatu aksi bisu (0, 1, "
 "atau 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Anda harus menyatakan suatu indeks masukan muara dan suatu aksi bisu (0, 1, "
 "atau 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Spesifikasi index masukan muara tak valid"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Spesifikasi index masukan muara tak valid"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3196,6 +4029,18 @@ msgstr ""
 "Anda harus menyatakan suatu indeks keluaran sumber dan suatu aksi bisu (0, "
 "1, atau 'toggle')"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Spesifikasi index keluaran sumber tak valid"
+
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "Anda mesti menyatakan suatu indeks/nama muara dan suatu nama port"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Spesifikasi index keluaran sumber tak valid"
@@ -3206,14 +4051,20 @@ msgstr ""
 "Anda mesti menyatakan paling tidak suatu path objek dan suatu nama pesan"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Argumen berlebih diberikan, mereka akan diabaikan. Perhatikan bahwa semua "
 "parameter pesan mesti diberikan sebagai sebuah string tunggal."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3221,17 +4072,29 @@ msgstr ""
 "Anda mesti menyatakan suatu indeks muara dan daftar format yang didukung "
 "yang dipisah titik koma"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Anda mesti menyatakan suatu indeks/nama kartu, suatu nama port, dan suatu "
 "ofset latensi"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Tak bisa mengurai ofset latensi"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Tak bisa mengurai ofset latensi"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Tak ada perintah valid yang dinyatakan."
 
@@ -3391,6 +4254,8 @@ msgstr "Gagal memuat data cookie\n"
 msgid "Not yet implemented.\n"
 msgstr "Belum diimplementasikan.\n"
 
+<<<<<<< HEAD
+=======
 #~ msgid ""
 #~ "\n"
 #~ "  -h, --help                            Show this help\n"
@@ -3409,6 +4274,7 @@ msgstr "Belum diimplementasikan.\n"
 #~ "  -n, --client-name=NAMA                Bagaimana memanggil klien ini "
 #~ "pada server\n"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #~ msgid "Failed to initialize daemon."
 #~ msgstr "Gagal menginisialisasi daemon."
 
diff --git a/po/it.po b/po/it.po
index 47a5ad662..e1e5e98a1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2021-04-19 20:02+0000\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <https://translate.fedoraproject.org/projects/"
@@ -630,7 +634,11 @@ msgid "Line In"
 msgstr "Line-In"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Microfono"
 
@@ -651,12 +659,20 @@ msgid "Internal Microphone"
 msgstr "Microfono interno"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -693,12 +709,20 @@ msgid "No Bass Boost"
 msgstr "Nessun incremento bassi"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Altoparlante"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Cuffie analogiche"
 
@@ -765,6 +789,7 @@ msgstr "Uscita gioco"
 #: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
 msgid "Chat Output"
 msgstr "Uscita chat"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:2821
 msgid "Chat Input"
@@ -774,6 +799,17 @@ msgstr "Ingresso chat"
 msgid "Virtual Surround 7.1"
 msgstr "Surround virtuale 7.1"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+msgstr "Ingresso chat"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+msgid "Virtual Surround 7.1"
+msgstr "Surround virtuale 7.1"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Mono analogico"
@@ -806,7 +842,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Cuffie con microfono"
 
@@ -919,7 +959,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Chat mono + Surround 7.1"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Spento"
 
@@ -933,7 +977,11 @@ msgstr "Uscita «%s»"
 msgid "%s Input"
 msgstr "Ingresso «%s»"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -950,7 +998,11 @@ msgstr ""
 "Attivazione avvenuta con POLLOUT impostato; tuttavia, una successiva "
 "snd_pcm_avail() ha ritornato 0 o un altro valore < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1045,6 +1097,64 @@ msgstr[1] ""
 "Molto probabilmente si tratta di un bug nel driver ALSA «%s». Segnalare "
 "questo problema agli sviluppatori ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Ingresso Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Uscita Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Sistema mani-libere"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Cuffie"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portabile"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Automobile"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefono"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Riproduzione ad alta fedeltà (sink A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Registrazione ad alta fedeltà (sorgente A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Unità headset head (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Gateway headset audio (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Unità handsfree head (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1101,6 +1211,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Unità handsfree head (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Gateway handsfree audio (HFP)"
 
@@ -1203,11 +1314,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Sink NULL temporizzato"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Uscita nulla"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Uscita nulla"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Impostazione del formato non riuscita: stringa %s non valida"
@@ -1230,14 +1349,24 @@ msgstr "Audio su @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunnel per %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunnel verso %s/%s"
@@ -1269,7 +1398,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Modello dispositivo sconosciuto"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Profilo standard RAOP"
 
@@ -1590,11 +1723,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Destinazione di registrazione non valida."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Audio interno"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Audio interno"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1871,7 +2012,11 @@ msgstr "Impostazione dello stream di monitor non riuscita: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() non riuscita: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Connessione non riuscita: %s"
@@ -2089,7 +2234,11 @@ msgstr ""
 "Compilato con libpulse %s\n"
 "Link eseguito con libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nome del client «%s» non valido"
@@ -2163,7 +2312,11 @@ msgstr ""
 "Attenzione: la specifica di campionamento indicata verrà soprascritta con "
 "quella dal file."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Determinazione della specifica di campionamento dal file non riuscita."
 
@@ -2200,7 +2353,11 @@ msgstr "riproduzione"
 msgid "Failed to set media name."
 msgstr "Impostazione nome del supporto non riuscita."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() non riuscita."
 
@@ -2208,11 +2365,19 @@ msgstr "pa_mainloop_new() non riuscita."
 msgid "io_new() failed."
 msgstr "io_new() non riuscita."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() non riuscita."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() non riuscita."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() non riuscita: %s"
@@ -2221,6 +2386,23 @@ msgstr "pa_context_connect() non riuscita: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() non riuscita."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() non riuscita."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NOME [ARG ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NOME|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() non riuscita."
@@ -2236,6 +2418,7 @@ msgstr "NOME|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NOME"
 
@@ -2247,7 +2430,11 @@ msgstr "NOME|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NOME|#N 1|0"
 
@@ -2283,7 +2470,11 @@ msgstr "NOMEPERCORSO"
 msgid "FILENAME SINK|#N"
 msgstr "NOMEFILE SINK|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N SINK|SORGENTE"
 
@@ -2291,6 +2482,17 @@ msgstr "#N SINK|SORGENTE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PROFILO SCHEDA"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NOME|#N PORTA"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PROFILO SCHEDA"
@@ -2300,6 +2502,7 @@ msgid "NAME|#N PORT"
 msgstr "NOME|#N PORTA"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NOME-SCHEDA|SCHEDA-#N PORTA OFFSET"
 
@@ -2315,7 +2518,11 @@ msgstr "LIVELLO-NUMERICO"
 msgid "FRAMES"
 msgstr "FRAME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "DESTINATARIO MESSAGGIO [PARAMETRI_MESSAGGIO]"
 
@@ -2383,19 +2590,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Recupero delle statistiche non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Attualmente in uso: %u blocco contenente %s byte in totale.\n"
 msgstr[1] "Attualmente in uso: %u blocchi contenenti %s byte in totale.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2407,22 +2626,38 @@ msgstr[1] ""
 "Allocato durante l'intera esecuzione: %u blocchi contenenti %s byte in "
 "totale.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Dimensione della cache dei campioni: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Recupero delle informazioni del server non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2439,7 +2674,11 @@ msgstr ""
 "Indice client: %u\n"
 "Dimensione tile: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2462,6 +2701,37 @@ msgstr ""
 "Sorgente predefinita: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "disponibilità sconosciuta"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "disponibile"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "non disponibile"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Line"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mic"
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "disponibilità sconosciuta"
@@ -2491,10 +2761,47 @@ msgid "Mic"
 msgstr "Mic"
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Cuffie con microfono"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Auricolare"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Rete"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analogico"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr "Auricolare"
@@ -2529,6 +2836,7 @@ msgstr "Analogico"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Recupero delle informazioni del sink non riuscito: %s"
@@ -2536,7 +2844,11 @@ msgstr "Recupero delle informazioni del sink non riuscito: %s"
 # nel relativo messaggio per il source
 # c'è "monitor of sink", quindi assumo che
 # qui dovesse essere "monitor of source"
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2575,38 +2887,67 @@ msgstr ""
 "\tProprietà:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorte:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (tipo: %s, priorità: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ", availability group: "
 msgstr ", gruppo disponibilità: "
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPorta attiva: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormati:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Recupero delle informazioni della sorgente non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2645,6 +2986,17 @@ msgstr ""
 "\tProprietà:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/d"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2654,11 +3006,16 @@ msgid "n/a"
 msgstr "n/d"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Recupero delle informazioni del modulo non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2675,12 +3032,20 @@ msgstr ""
 "\tProprietà:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Recupero delle informazioni del client non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2695,12 +3060,20 @@ msgstr ""
 "\tProprietà:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Recupero delle informazioni della scheda non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2717,29 +3090,49 @@ msgstr ""
 "\tProprietà:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfili:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (sink: %u, sorgenti: %u, priorità: %u, disponibile: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tProfilo attivo: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 "\t\t%s: %s (tipo: %s, priorità: %u, offset latenza: %<PRId64> usec%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2748,7 +3141,11 @@ msgstr ""
 "\t\t\tProprietà:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tParte dei profili: %s"
@@ -2757,12 +3154,20 @@ msgstr "\t\t\tParte dei profili: %s"
 # A stream that is connected to an output device, i.e. an input for a sink.
 #
 # from http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/WritingVolumeControlUIs/
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Recupero delle informazioni dell'ingresso per il sink non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2805,13 +3210,21 @@ msgstr ""
 # A stream that is connected to an input device, i.e. an output of a source.
 #
 # from http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/WritingVolumeControlUIs/
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 "Recupero delle informazioni dell'uscita per la sorgente non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2850,13 +3263,21 @@ msgstr ""
 "\tProprietà:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Recupero delle informazioni del campione non riuscito: %s"
 
 # campiona lazy??
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2885,21 +3306,44 @@ msgstr ""
 "\tProprietà:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Fallimento: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Invia messaggio non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2909,16 +3353,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Scaricamento del modulo non riuscito: modulo %s non caricato"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2933,11 +3386,74 @@ msgstr[1] ""
 "Impostazione del volume non riuscita: tentata l'impostazione dei volumi per "
 "%d canali dove i canali supportati = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Caricamento del campione non riuscito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Fine del file prematura"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nuovo"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "modifica"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "rimuovi"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "sink"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "sorgente"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "sink-input"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "sorgente-output"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modulo"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "client"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "sample-cache"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "scheda"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Fine del file prematura"
@@ -2995,10 +3511,78 @@ msgid "card"
 msgstr "scheda"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Evento «%s» su %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Ricevuto SIGINT, uscita."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Specifica di volume non valida"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volume oltre l'intervallo permesso.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Numero di specifiche volume non valido.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Specifica di volume non consistente.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opzioni]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPO]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NOMEFILE [NOME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NOME [SINK]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NOME|#N VOLUME"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "Volume"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NOME|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATI"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Ricevuto SIGINT, uscita."
@@ -3064,6 +3648,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATI"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3075,8 +3660,13 @@ msgstr ""
 "possono essere usati per specificare il sink, l'origine e il monitor "
 "predefiniti.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3098,7 +3688,11 @@ msgstr ""
 "  -n, --client-name=NOME                Il nome da dare a questo client sul "
 "server\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3109,16 +3703,31 @@ msgstr ""
 "Compilato con libpulse %s\n"
 "Link eseguito con libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Nome dello stream «%s» non valido"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Specificare nulla o uno di: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Specificare un file campione da caricare"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Apertura del file audio non riuscita."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Specificare un file campione da caricare"
@@ -3128,11 +3737,27 @@ msgid "Failed to open sound file."
 msgstr "Apertura del file audio non riuscita."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Attenzione: determinazione della specifica di campionamento dal file non "
 "riuscita."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "È necessario specificare un nome di campione da riprodurre"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "È necessario specificare un nome di campione da rimuovere"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "È necessario specificare un indice di ingresso per sink e un sink"
+
+#: src/utils/pactl.c:2042
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "È necessario specificare un nome di campione da riprodurre"
@@ -3146,10 +3771,22 @@ msgid "You have to specify a sink input index and a sink"
 msgstr "È necessario specificare un indice di ingresso per sink e un sink"
 
 #: src/utils/pactl.c:2854
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a source"
 msgstr ""
 "È necessario specificare una indice di uscita per sorgente e una sorgente"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "È necessario specificare un nome di modulo e gli argomenti."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "È necessario specificare l'indice di un modulo o un nome"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2869
 msgid "You have to specify a module name and arguments."
 msgstr "È necessario specificare un nome di modulo e gli argomenti."
@@ -3159,17 +3796,26 @@ msgid "You have to specify a module index or name"
 msgstr "È necessario specificare l'indice di un modulo o un nome"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Non è possibile specificare più di un sink. È necessario specificare un "
 "valore booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Specifica di sospensione non valida."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Specifica di sospensione non valida."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3177,6 +3823,29 @@ msgstr ""
 "Non è possibile specificare più di una sorgente. È necessario specificare un "
 "valore booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "È necessario specificare un nome/indice di scheda e un nome di profilo"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "È necessario specificare un nome/indice di sink e un nome di porta"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "È necessario specificare un nome di sink"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "È necessario specificare un nome/indice di sorgente e un nome di porta"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "È necessario specificare il nome di una sorgente"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "È necessario specificare un nome/indice di scheda e un nome di profilo"
@@ -3198,19 +3867,43 @@ msgid "You have to specify a source name"
 msgstr "È necessario specificare il nome di una sorgente"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "È necessario specificare un nome di sink"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "È necessario specificare un nome/indice di sink e un nome di porta"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "È necessario specificare un nome/indice di sink e un nome di porta"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "È necessario specificare il nome di una sorgente"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "È necessario specificare un nome/indice di sorgente e un nome di porta"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "È necessario specificare un indice di ingresso per sink e un sink"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Indice dell'input del sink non valido"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "È necessario specificare un nome/indice di sorgente e un nome di porta"
@@ -3224,45 +3917,75 @@ msgid "Invalid sink input index"
 msgstr "Indice dell'input del sink non valido"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a volume"
 msgstr ""
 "È necessario specificare un indice di uscita per la sorgente e il volume"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Indice di uscita per la sorgente non valido"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3065
 msgid "Invalid source output index"
 msgstr "Indice di uscita per la sorgente non valido"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "È necessario specificare un nome/indice di sink e un'azione per il muto (0, "
 "1 o \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Specifica per il muto non valida"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Specifica per il muto non valida"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "È necessario specificare un nome/indice di sorgente e un'azione per il muto "
 "(0, 1 o \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "È necessario specificare un indice d'ingresso per il sink e un'azione per il "
 "muto (0, 1 o \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Specifica dell'indice di input del sink non valida"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Specifica dell'indice di input del sink non valida"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3270,22 +3993,38 @@ msgstr ""
 "È necessario specificare un indice di uscita per il sink e un'azione per il "
 "muto (0, 1 o \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Specifica di indice di uscita per la sorgente non valida"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Specifica di indice di uscita per la sorgente non valida"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "È necessario specificare un nome/indice di sink e un nome di porta"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3293,17 +4032,29 @@ msgstr ""
 "È necessario specificare un indice di sink e un elenco separato da punti e "
 "virgola di formati supportati"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "È necessario specificare un nome o un indice per la scheda, un nome per la "
 "porta e un offset di latenza"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Impossibile analizzare l'offset della latenza"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Impossibile analizzare l'offset della latenza"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Nessun comando valido specificato."
 
diff --git a/po/ja.po b/po/ja.po
index 3b85b70ea..4e1c88954 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,17 +13,29 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2016-03-15 08:25+0000\n"
+"Last-Translator: Kenzo Moriguchi <kmoriguc@redhat.com>\n"
+"Language-Team: Japanese <jp@li.org>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-02-20 03:16+0000\n"
 "Last-Translator: Takuro Onoue <kusanaginoturugi@gmail.com>\n"
 "Language-Team: Japanese <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/ja/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Generator: Zanata 4.6.2\n"
+"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
+=======
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.10.1\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, fuzzy, c-format
@@ -170,10 +182,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail はブーリアン引数を予期します。"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level はログレベル引数を予期します（数値幅0～4、又はデバグ、情報、注"
 "記、警告、エラーの中の1つ）"
@@ -559,6 +577,7 @@ msgstr "pa_core_new() は失敗"
 #, fuzzy
 msgid "command line arguments"
 msgstr "引数が多過ぎます。"
+<<<<<<< HEAD
 
 #: src/daemon/main.c:1275
 #, c-format
@@ -567,6 +586,16 @@ msgid ""
 "Source of commands: %s"
 msgstr ""
 
+=======
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr ""
@@ -601,7 +630,11 @@ msgid "Line In"
 msgstr "ラインイン"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "マイクロフォン"
 
@@ -622,12 +655,20 @@ msgid "Internal Microphone"
 msgstr "内部マイクロフォン"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "ラジオ"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "ビデオ"
 
@@ -664,12 +705,20 @@ msgid "No Bass Boost"
 msgstr "低音ブーストなし"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "スピーカー"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "アナログヘッドフォン"
 
@@ -742,6 +791,7 @@ msgstr "%s 出力"
 #, fuzzy
 msgid "Chat Output"
 msgstr "%s 出力"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:2821
 #, fuzzy
@@ -753,6 +803,19 @@ msgstr "%s 入力"
 msgid "Virtual Surround 7.1"
 msgstr "仮想サラウンドシンク"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "%s 入力"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "仮想サラウンドシンク"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "アナログモノ"
@@ -787,7 +850,11 @@ msgid "Stereo"
 msgstr "ステレオ"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "ヘッドセット"
 
@@ -903,7 +970,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "オフ"
 
@@ -917,7 +988,11 @@ msgstr "%s 出力"
 msgid "%s Input"
 msgstr "%s 入力"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -934,7 +1009,11 @@ msgstr ""
 "POLLOUT セットで呼び起こされましたが、その結果としての snd_pcm_avail() は 0 "
 "又は他の値 < min_avail を返しました。"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1016,6 +1095,52 @@ msgstr[0] ""
 "これは多分、ALSA ドライバー '%s' 内のバグです。この問題は ALSA 開発者宛に報告"
 "を提出して下さい。"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth 入力"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth 出力"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "ハンズフリー"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "ヘッドフォン"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "ポータブル"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "車"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "電話"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "ハイファイ再生 (A2DP シンク)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "ハイファイキャプチャー (A2DP ソース)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1060,21 +1185,34 @@ msgid "High Fidelity Capture (A2DP Source)"
 msgstr "ハイファイキャプチャー (A2DP ソース)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2066
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Head Unit (HSP)"
 msgstr "ヘッドセットヘッドユニット (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2079
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Audio Gateway (HSP)"
 msgstr "ヘッドセットオーディオゲートウェイ (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2092
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Head Unit (HFP)"
 msgstr "ヘッドセットヘッドユニット (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "ヘッドセットオーディオゲートウェイ (HSP/HFP)"
@@ -1140,8 +1278,13 @@ msgstr ""
 "ル数> channel_map=<チャンネルマップ> autoloaded=<このモジュールが自動でロード"
 "されている場合にセット> use_volume_sharing=<yes 又は no> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1178,11 +1321,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "クロック付き NULL シンク"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null 出力"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null 出力"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "形式のセットに失敗しました: 無効な形式文字列 %s"
@@ -1205,14 +1356,24 @@ msgstr "@HOSTNAME@ 上のオーディオ"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "%s@%s のトンネル"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "%s/%s へのトンネル"
@@ -1242,7 +1403,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "不明なエラーコード"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1453,7 +1618,10 @@ msgstr "上部右後ろ"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "無効)"
 
@@ -1560,11 +1728,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "無効なログターゲット。"
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "内部オーディオ"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "内部オーディオ"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "モデム"
 
@@ -1840,7 +2016,11 @@ msgstr "モニターストリームの設定に失敗しました: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() は失敗: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "接続失敗: %s"
@@ -1998,6 +2178,7 @@ msgstr ""
 "      --list-file-formats               利用可能な形式を一覧表示。\n"
 "      --monitor-stream=INDEX            インデックス INDEX のシンク入力から録"
 "音。\n"
+<<<<<<< HEAD
 
 #: src/utils/pacat.c:793
 msgid "Play back encoded audio files on a PulseAudio sound server."
@@ -2008,6 +2189,18 @@ msgid ""
 "Capture audio data from a PulseAudio sound server and write it to a file."
 msgstr ""
 
+=======
+
+#: src/utils/pacat.c:793
+msgid "Play back encoded audio files on a PulseAudio sound server."
+msgstr ""
+
+#: src/utils/pacat.c:797
+msgid ""
+"Capture audio data from a PulseAudio sound server and write it to a file."
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:801
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to STDOUT or "
@@ -2031,7 +2224,11 @@ msgstr ""
 "libpulse %s でコンパイル\n"
 "libpulse %s で接続\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "無効なクライアント名 '%s'"
@@ -2102,7 +2299,11 @@ msgid ""
 "specification from file."
 msgstr "警告: 指定されたサンプルの仕様はファイルからの仕様で上書きされます。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ファイルからのサンプル仕様の決定に失敗しました。"
 
@@ -2137,7 +2338,11 @@ msgstr "再生"
 msgid "Failed to set media name."
 msgstr "メディア名のセットに失敗しました。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() は失敗"
 
@@ -2145,11 +2350,19 @@ msgstr "pa_mainloop_new() は失敗"
 msgid "io_new() failed."
 msgstr "io_new() は失敗"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() は失敗"
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() は失敗"
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() は失敗: %s"
@@ -2158,6 +2371,23 @@ msgstr "pa_context_connect() は失敗: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() は失敗"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() は失敗"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "名前 [引数 ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "名前|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() は失敗"
@@ -2173,6 +2403,7 @@ msgstr "名前|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "名前"
 
@@ -2184,7 +2415,11 @@ msgstr "名前|#N ボリューム"
 msgid "#N VOLUME"
 msgstr "#N ボリューム"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "名前|#N 1|0"
 
@@ -2220,7 +2455,11 @@ msgstr "パス名"
 msgid "FILENAME SINK|#N"
 msgstr "ファイル名 シンク|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N シンク|ソース"
 
@@ -2228,6 +2467,17 @@ msgstr "#N シンク|ソース"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "カードプロフィール"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "名前|#N ポート"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "カードプロフィール"
@@ -2237,6 +2487,7 @@ msgid "NAME|#N PORT"
 msgstr "名前|#N ポート"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "カード-名前|カード-#N ポート オフセット"
 
@@ -2253,7 +2504,11 @@ msgstr "数的レベル"
 msgid "FRAMES"
 msgstr "フレーム"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2320,40 +2575,68 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "統計の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "現在使用中: %u ブロックは合計 %s バイトを含む\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] "総寿命の期間中に割り当て: %u ブロックは合計 %s バイトを含む\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "サンプルのキャッシュサイズ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "サーバー情報の取得に失敗 : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2370,7 +2653,11 @@ msgstr ""
 "クライアントインデックス: %u\n"
 "タイルサイズ: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2393,6 +2680,21 @@ msgstr ""
 "デフォルトソース: %s\n"
 "クッキー: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2406,28 +2708,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "不明"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "ラインイン"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "ヘッドセット"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2449,26 +2791,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Bluetooth 入力"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "アナログモノ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "シンク情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2507,37 +2867,66 @@ msgstr ""
 "\tプロパティー:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tポート:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\t活動中ポート: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\t形式:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "ソース情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2576,6 +2965,17 @@ msgstr ""
 "\tプロパティー:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2585,11 +2985,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "モジュール情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2606,12 +3011,20 @@ msgstr ""
 "\tプロパティ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "クライアント情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2626,12 +3039,20 @@ msgstr ""
 "\tプロパティ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "カード情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2648,26 +3069,60 @@ msgstr ""
 "\tプロパティ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tプロフィール:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\t有効なプロフィール: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+#, c-format
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
+msgstr ""
+"\t\t\tプロパティ:\n"
+"\t\t\t\t%s\n"
+
+#: src/utils/pactl.c:684
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr "\t\t\tプロファイルの一部: %s"
+
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 
 #: src/utils/pactl.c:1261
 #, c-format
@@ -2684,11 +3139,16 @@ msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tプロファイルの一部: %s"
 
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "シンク入力情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2727,12 +3187,20 @@ msgstr ""
 "\tプロパティ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "ソース出力情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2771,12 +3239,20 @@ msgstr ""
 "\tプロパティ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "サンプル情報の取得に失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2805,21 +3281,44 @@ msgstr ""
 "\tプロパティ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "失敗: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() は失敗: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr "list-handlers メッセージ応答を正しく解釈できません"
@@ -2829,16 +3328,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr "list-handlers メッセージ応答が JSON 配列ではありません"
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "モジュールのアンロードに失敗: モジュール %s はロードされていません"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2850,11 +3358,74 @@ msgstr[0] ""
 "ボリュームの設定に失敗: %d チャンネルのボリューム設定を試みましたが、 チャン"
 "ネルはサポートされています = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "サンプルのアップロードに失敗しました: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "ファイルの早期終了"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "新規"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "変更"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "削除"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "不明"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "シンク"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "ソース"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "シンク入力"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "ソース出力"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "モジュール"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "クライアント"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "サンプルキャッシュ"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "サーバー"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "カード"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "ファイルの早期終了"
@@ -2912,10 +3483,78 @@ msgid "card"
 msgstr "カード"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "イベント '%s' が %s #%u 上にあります\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT を取得、退出中"
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "無効なボリューム仕様"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "許容範囲外のボリューム\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "ボリューム仕様の数が無効。\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "ボリューム仕様が非整合。\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[オプション]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[タイプ]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "ファイル名 [名前]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "名前 [シンク]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "名前|#N ボリューム [ボリューム ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N ボリューム [ボリューム ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "名前|#N 1|0|切り替え"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|切り替え"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N 形式"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT を取得、退出中"
@@ -2981,6 +3620,7 @@ msgid "#N FORMATS"
 msgstr "#N 形式"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2992,15 +3632,23 @@ msgstr ""
 "を使用して、デフォルトのシンク、ソースおよびモニターを指定することができま"
 "す。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -n, --client-name=NAME                How to call this client on the "
@@ -3013,7 +3661,11 @@ msgstr ""
 "  -s, --server=SERVER           接続先サーバーの名前\n"
 "  -n, --client-name=NAME        サーバーでこのクライアントへのコール方法\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3024,16 +3676,59 @@ msgstr ""
 "libpulse %s でコンパイル\n"
 "libpulse %s でリンク\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "無効なストリーム名 '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "何も指定しないか以下から1つ指定してください: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "ロードするサンプルファイルを指定して下さい"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "サウンドファイルを開くのに失敗しました。"
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "警告: ファイルからサンプル仕様を決定するのに失敗しました。"
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "再生するサンプル名を指定する必要があります"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "削除するサンプル名を指定する必要があります。"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "シンク入力インデックスとシンクを指定する必要があります"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "ソース出力インデックスとソースを指定する必要があります"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "モジュール名と引数を指定する必要があります"
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "モジュールインデックスもしくは名前を指定する必要があります"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "ロードするサンプルファイルを指定して下さい"
@@ -3071,22 +3766,54 @@ msgid "You have to specify a module index or name"
 msgstr "モジュールインデックスもしくは名前を指定する必要があります"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "シンクは1つ以上は指定できません。ブーリアン値を1つ指定する必要があります。"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "無効なサスペンド仕様。"
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "無効なサスペンド仕様。"
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "ソースは1つ以上は指定できません。ブーリアン値を1つ指定する必要があります。"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "カードの名前/インデックスとプロフィール名を指定する必要があります"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "シンクの名前/インデックスとポート名を指定する必要があります"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "シンクの名前を指定する必要があります"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "ソースの名前/インデックスとポート名を指定する必要があります"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "ソースの名前を指定する必要があります"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "カードの名前/インデックスとプロフィール名を指定する必要があります"
@@ -3108,19 +3835,51 @@ msgid "You have to specify a source name"
 msgstr "ソースの名前を指定する必要があります"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "シンクの名前を指定する必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "シンクの名前/インデックスとボリュームを指定する必要があります"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "シンクの名前/インデックスとボリュームを指定する必要があります"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "ソースの名前を指定する必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "ソースの名前/インデックスとボリュームを指定する必要があります"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "シンク入力インデックスとボリュームを指定する必要があります"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "無効なシンク入力インデックス"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "ソース出力インデックスとボリュームを指定する必要があります"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "無効なソース出力インデックス"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "ソースの名前/インデックスとボリュームを指定する必要があります"
@@ -3142,55 +3901,93 @@ msgid "Invalid source output index"
 msgstr "無効なソース出力インデックス"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "シンクの名前/インデックスとミュートブーリアンを指定する必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "無効なミュート仕様"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "無効なミュート仕様"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ソースの名前/インデックスとミュートブーリアンを指定する必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "シンク入力インデックスとミュートブーリアンを指定する必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "無効なシンク入力インデックス仕様"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "無効なシンク入力インデックス仕様"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "ソース出力インデックスとミュートブーリアンを指定する必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "無効なソース出力インデックス仕様"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "無効なソース出力インデックス仕様"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "シンクの名前/インデックスとポート名を指定する必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3198,17 +3995,29 @@ msgstr ""
 "シンクのインデックスとサポートしている形式のセミコロンで隔離した一覧を指定す"
 "る必要があります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "カードの名前/インデックス、ポート名および待機時間オフセットを指定する必要があ"
 "ります"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "待機時間オフセットを解析できませんでした"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "待機時間オフセットを解析できませんでした"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "有効なコマンドが指定されていません"
 
diff --git a/po/kk.po b/po/kk.po
index d5a8959da..556d0ea50 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2020-06-30 08:04+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: \n"
@@ -497,7 +501,11 @@ msgid "Line In"
 msgstr "Сызықтық кіріс"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Микрофон"
 
@@ -518,12 +526,20 @@ msgid "Internal Microphone"
 msgstr "Ішкі микрофон"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Радио"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Видео"
 
@@ -560,12 +576,20 @@ msgid "No Bass Boost"
 msgstr "Бас күшейту жоқ"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Динамик"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Құлаққаптар"
 
@@ -678,7 +702,11 @@ msgid "Stereo"
 msgstr "Стерео"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Гарнитура"
 
@@ -792,7 +820,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Сөнд."
 
@@ -882,6 +914,52 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth кірісі"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth шығысы"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Хендс-фри"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Құлаққап"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Портативті динамик"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Автомобильдік динамик"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Жоғарғы сапалы ойнату (A2DP қабылдағышы)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Жоғарғы сапалы жазу (A2DP қайнаркөзі)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -926,21 +1004,34 @@ msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Жоғарғы сапалы жазу (A2DP қайнаркөзі)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2066
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Head Unit (HSP)"
 msgstr "Гарнитура (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2079
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headset Audio Gateway (HSP)"
 msgstr "Аудиогарнитура адаптері (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2092
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Head Unit (HFP)"
 msgstr "Гарнитура (HSP/HFP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Аудиогарнитура адаптері (HSP/HFP)"
@@ -1020,11 +1111,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Бос шығысы"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Бос шығысы"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
@@ -1047,14 +1146,24 @@ msgstr ""
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1391,11 +1500,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Журнал мақсаты дұрыс емес."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Құрамындағы аудио"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Құрамындағы аудио"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Модем"
 
@@ -1670,7 +1787,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Байланысты орнату сәтсіз аяқталды: %s"
@@ -1806,7 +1927,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1877,7 +2002,11 @@ msgid ""
 "specification from file."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1911,7 +2040,11 @@ msgstr "ойнау"
 msgid "Failed to set media name."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() сәтсіз аяқталды."
 
@@ -1919,11 +2052,19 @@ msgstr "pa_mainloop_new() сәтсіз аяқталды."
 msgid "io_new() failed."
 msgstr "io_new() сәтсіз аяқталды."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() сәтсіз аяқталды."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() сәтсіз аяқталды."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() сәтсіз аяқталды: %s"
@@ -1932,6 +2073,23 @@ msgstr "pa_context_connect() сәтсіз аяқталды: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() сәтсіз аяқталды."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() сәтсіз аяқталды."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() сәтсіз аяқталды."
@@ -1947,6 +2105,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -1958,7 +2117,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -1994,7 +2157,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2002,6 +2169,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2011,6 +2189,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2026,7 +2205,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2084,19 +2267,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Статистиканы алу сәтсіз аяқталды: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2104,22 +2299,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2130,7 +2341,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2144,20 +2359,88 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
 
 #: src/utils/pactl.c:321
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "available"
 msgstr ", қолжетімді"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:274
+=======
 #: src/utils/pactl.c:322
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "not available"
 msgstr ", қолжетімсіз"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Белгісіз"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Қосалқы"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Сызықтық"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Микрофон"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Телефон тұтқасы"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Құлаққап"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Желі"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Аналогтық"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
 msgid "Unknown"
 msgstr "Белгісіз"
@@ -2212,11 +2495,16 @@ msgstr "Аналогтық"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2238,38 +2526,67 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tПорттар:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ", availability group: "
 msgstr ", қолжетімді топ: "
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tБелсенді порт: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tПішімдер:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2291,6 +2608,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "қ/ж"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2300,11 +2628,16 @@ msgid "n/a"
 msgstr "қ/ж"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2315,12 +2648,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2330,12 +2671,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2346,28 +2695,48 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tПрофильдер:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tБелсенді профиль: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2376,17 +2745,29 @@ msgstr ""
 "\t\t\tҚасиеттері:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2408,12 +2789,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2435,12 +2824,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2457,21 +2854,44 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() сәтсіз аяқталды: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2481,16 +2901,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2501,11 +2930,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Файлдың уақытынан бұрын аяқталуы"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "жаңа"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "өзгерту"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "өшіру"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "белгісіз"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "аудиоқабылдағыш"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "қайнаркөз"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "аудиоқабылдағыш-кіріс"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "қайнаркөз-шығыс"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "модуль"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "клиент"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "сервер"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "карта"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Файлдың уақытынан бұрын аяқталуы"
@@ -2563,10 +3055,78 @@ msgid "card"
 msgstr "карта"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT алынды, шығу."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[опциялар]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[ТҮРІ]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT алынды, шығу."
@@ -2632,6 +3192,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2639,8 +3200,13 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -2661,7 +3227,11 @@ msgstr ""
 "  -n, --client-name=АТЫ                 Бұл клиентті серверде қалай атау "
 "керек\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2669,16 +3239,59 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr ""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Жүктеу үшін үлгі файлын көрсетіңіз"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Дыбыс файлын ашу сәтсіз аяқталды."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Жүктеу үшін үлгі файлын көрсетіңіз"
@@ -2716,20 +3329,84 @@ msgid "You have to specify a module index or name"
 msgstr ""
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr ""
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr ""
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
@@ -2783,35 +3460,68 @@ msgid "Invalid source output index"
 msgstr ""
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr ""
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr ""
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr ""
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr ""
@@ -2821,17 +3531,33 @@ msgid "You have to specify at least an object path and a message name"
 msgstr ""
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -2841,6 +3567,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Жарамды команда көрсетілмеген."
 
diff --git a/po/kn.po b/po/kn.po
index ed3c6a309..7f67b4ce4 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.kn\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:54+0000\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <kde-l10n-kn@kde.org>\n"
@@ -174,10 +178,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail ಬೂಲಿಯನ್ ಆರ್ಗುಮೆಂಟನ್ನು ನಿರೀಕ್ಷಿಸುತ್ತದೆ"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level ದಾಖಲೆ ಮಟ್ಟದ ಆರ್ಗುಮೆಂಟನ್ನು ನಿರೀಕ್ಷಿಸುತ್ತದೆ (0..4 ವ್ಯಾಪ್ತಿಯಲ್ಲಿನ ಅಂಕೆಯನ್ನು "
 "ಅಥವ debug, info, notice, warn, error ಅನ್ನು)."
@@ -603,7 +613,11 @@ msgid "Line In"
 msgstr "ಲೈನ್-ಇನ್"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "ಮೈಕ್ರೊಫೋನ್"
 
@@ -626,12 +640,20 @@ msgid "Internal Microphone"
 msgstr "ಆಂತರಿಕ  ಮೈಕ್ರೊಫೋನ್"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "ರೇಡಿಯೊ"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "ವೀಡಿಯೊ"
 
@@ -670,12 +692,20 @@ msgid "No Bass Boost"
 msgstr "ಯಾವುದೆ ಬೂಸ್ಟ್ ಇಲ್ಲ"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "ಅನಲಾಗ್ ಹೆಡ್‌ಫೋನ್‌ಗಳು"
 
@@ -762,6 +792,7 @@ msgstr "ಇನ್‌ಪುಟ್"
 #, fuzzy
 msgid "Virtual Surround 7.1"
 msgstr "ಅನಲಾಗ್ ಸರೌಂಡ್‌ 7.1"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
@@ -792,12 +823,48 @@ msgstr "ಅನಲಾಗ್ ಸ್ಟೀರಿಯೋ"
 msgid "Mono"
 msgstr "ಮೊನೊ"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "ಅನಲಾಗ್ ಮೊನೊ"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "ಅನಲಾಗ್ ಮೊನೊ"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "ಅನಲಾಗ್ ಮೊನೊ"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "ಅನಲಾಗ್ ಸ್ಟೀರಿಯೋ"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "ಮೊನೊ"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
 msgid "Stereo"
 msgstr "ಸ್ಟೀರಿಯೋ"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -914,7 +981,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "ಜಡ"
 
@@ -928,7 +999,11 @@ msgstr "ಶೂನ್ಯ ಔಟ್‌ಪುಟ್"
 msgid "%s Input"
 msgstr "ಇನ್‌ಪುಟ್"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -943,7 +1018,11 @@ msgstr ""
 "ವಿಕಸನಗಾರರ ಗಮನಕ್ಕೆ ತನ್ನಿ.POLLOUT ಸೆಟ್‌ನಿಂದ ನಾವು ಎಚ್ಚೆತ್ತುಗೊಂಡಿದ್ದೇವೆ -- ಆದರೆ ನಂತರದ "
 "snd_pcm_avail() 0 ಅಥವ min_avail ಕ್ಕಿಂತ ಚಿಕ್ಕದಾದ ಇನ್ನೊಂದು ಮೌಲ್ಯವನ್ನು ಮರಳಿಸಿದೆ."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -978,6 +1057,80 @@ msgstr[1] ""
 "snd_pcm_avail() ದಿಂದ ಅತ್ಯಂತ ದೊಡ್ಡದಾದ ಮೌಲ್ಯವು ಮರಳಿದೆ: %lu ಬೈಟ್‌ಗಳು (%lu ms).\n"
 "ಇದಕ್ಕೆ ALSA ಚಾಲಕ '%s' ದಲ್ಲಿನ ಒಂದು ದೋಷದ ಕಾರಣವಿರಬಹುದು. ದಯವಿಟ್ಟುಈ ತೊಂದರೆಯನ್ನು ALSA "
 "ವಿಕಸನಗಾರರ ಗಮನಕ್ಕೆ ತನ್ನಿ."
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-util.c:1249
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() ದಿಂದ ಅತ್ಯಂತ ದೊಡ್ಡದಾದ ಮೌಲ್ಯವು ಮರಳಿದೆ: %li ಬೈಟ್‌ಗಳು (%s%lu ms).\n"
+"ಇದಕ್ಕೆ ALSA ಚಾಲಕ '%s' ದಲ್ಲಿನ ಒಂದು ದೋಷದ ಕಾರಣವಿರಬಹುದು. ದಯವಿಟ್ಟುಈ ತೊಂದರೆಯನ್ನು ALSA "
+"ವಿಕಸನಗಾರರ ಗಮನಕ್ಕೆ ತನ್ನಿ."
+msgstr[1] ""
+"snd_pcm_delay() ದಿಂದ ಅತ್ಯಂತ ದೊಡ್ಡದಾದ ಮೌಲ್ಯವು ಮರಳಿದೆ: %li ಬೈಟ್‌ಗಳು (%s%lu ms).\n"
+"ಇದಕ್ಕೆ ALSA ಚಾಲಕ '%s' ದಲ್ಲಿನ ಒಂದು ದೋಷದ ಕಾರಣವಿರಬಹುದು. ದಯವಿಟ್ಟುಈ ತೊಂದರೆಯನ್ನು ALSA "
+"ವಿಕಸನಗಾರರ ಗಮನಕ್ಕೆ ತನ್ನಿ."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, fuzzy, 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 ""
+"snd_pcm_avail() ದಿಂದ ಅತ್ಯಂತ ದೊಡ್ಡದಾದ ಮೌಲ್ಯವು ಮರಳಿದೆ: %lu ಬೈಟ್‌ಗಳು (%lu ms).\n"
+"ಇದಕ್ಕೆ ALSA ಚಾಲಕ '%s' ದಲ್ಲಿನ ಒಂದು ದೋಷದ ಕಾರಣವಿರಬಹುದು. ದಯವಿಟ್ಟುಈ ತೊಂದರೆಯನ್ನು ALSA "
+"ವಿಕಸನಗಾರರ ಗಮನಕ್ಕೆ ತನ್ನಿ."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() ದಿಂದ ಅತ್ಯಂತ ದೊಡ್ಡದಾದ ಮೌಲ್ಯವು ಮರಳಿದೆ: %lu ಬೈಟ್‌ಗಳು (%lu ms).\n"
+"ಇದಕ್ಕೆ ALSA ಚಾಲಕ '%s' ದಲ್ಲಿನ ಒಂದು ದೋಷದ ಕಾರಣವಿರಬಹುದು. ದಯವಿಟ್ಟುಈ ತೊಂದರೆಯನ್ನು ALSA "
+"ವಿಕಸನಗಾರರ ಗಮನಕ್ಕೆ ತನ್ನಿ."
+msgstr[1] ""
+"snd_pcm_mmap_begin() ದಿಂದ ಅತ್ಯಂತ ದೊಡ್ಡದಾದ ಮೌಲ್ಯವು ಮರಳಿದೆ: %lu ಬೈಟ್‌ಗಳು (%lu ms).\n"
+"ಇದಕ್ಕೆ ALSA ಚಾಲಕ '%s' ದಲ್ಲಿನ ಒಂದು ದೋಷದ ಕಾರಣವಿರಬಹುದು. ದಯವಿಟ್ಟುಈ ತೊಂದರೆಯನ್ನು ALSA "
+"ವಿಕಸನಗಾರರ ಗಮನಕ್ಕೆ ತನ್ನಿ."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+#, fuzzy
+msgid "Bluetooth Output"
+msgstr "ಅನಲಾಗ್ ಔಟ್‌ಪುಟ್"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 
 #: src/modules/alsa/alsa-util.c:1249
 #, fuzzy, c-format
@@ -1050,10 +1203,30 @@ msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "ಅನಲಾಗ್ ಹೆಡ್‌ಫೋನ್‌ಗಳು"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1071,15 +1244,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "ಹೈ ಫಿಡಿಲಿಟಿ ಪ್ಲೇಬ್ಯಾಕ್ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "ಹೈ ಫಿಡಿಲಿಟಿ ಕ್ಯಾಪ್ಚರ್ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1093,6 +1286,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1153,8 +1347,13 @@ msgstr ""
 "label=<ladspa ಪ್ಲಗ್‌ಇನ್ ಹೆಸರು> control=<ವಿರಾಮ ಚಿಹ್ನೆಗಳನ್ನು ಹೊಂದಿರುವ ಇನ್‌ಪುಟ್ ನಿಯಂತ್ರಣ "
 "ಮೌಲ್ಯಗಳ ಪಟ್ಟಿ>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1190,11 +1389,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "ಕ್ಲಾಕ್‌ ಮಾಡಲಾದ NULL ಸಿಂಕ್"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "ಶೂನ್ಯ ಔಟ್‌ಪುಟ್"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "ಶೂನ್ಯ ಔಟ್‌ಪುಟ್"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "ಆಕರದ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
@@ -1217,14 +1424,24 @@ msgstr "@HOSTNAME@ ನಲ್ಲಿನ ಆಡಿಯೊ"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1256,6 +1473,16 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "ಅಜ್ಞಾತ ದೋಷ ಸಂಜ್ಞೆ"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio ಧ್ವನಿ ಪರಿಚಾರಕ"
+
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr ""
@@ -1264,6 +1491,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr "PulseAudio ಧ್ವನಿ ಪರಿಚಾರಕ"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr "ಎದುರಿನ ಮಧ್ಯಭಾಗ"
@@ -1455,6 +1683,135 @@ msgstr "ಮೇಲಿನ ಎದುರಿನ ಬಲಭಾಗ"
 #: src/pulse/channelmap.c:160
 msgid "Top Rear Center"
 msgstr "ಮೇಲಿನ ಹಿಂಬದಿಯ ಮಧ್ಯಭಾಗ"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "ಮೇಲಿನ ಹಿಂಬದಿಯ ಎಡಭಾಗ"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "ಮೇಲಿನ ಹಿಂಬದಿಯ ಬಲಭಾಗ"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(ಅಮಾನ್ಯ)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "ಸರೌಂಡ್‌ 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "ಸರೌಂಡ್‌ 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "ಸರೌಂಡ್‌ 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "ಸರೌಂಡ್‌ 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "ಸರೌಂಡ್‌ 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() ವಿಫಲಗೊಂಡಿದೆ: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "ಕುಕಿ ದತ್ತಾಂಶವನ್ನು ಪಾರ್ಸ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "ಫೋರ್ಕ್(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "ಅಜ್ಞಾತ ವಿಸ್ತರಣೆ '%s' ಇಂದ ಸಂದೇಶವನ್ನು ಪಡೆದುಕೊಳ್ಳಲಾಗಿದೆ"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "ಇನ್‌ಪುಟ್"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "ಶೂನ್ಯ ಔಟ್‌ಪುಟ್"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(ಅಮಾನ್ಯ)"
+
+#: src/pulsecore/core-util.c:1790
+#, 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 ""
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr ""
+
+#: src/pulsecore/core-util.h:97
+#, fuzzy
+msgid "no"
+msgstr "ಮೊನೊ"
+
+#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "ಸ್ವಯಂಹೆಚ್ಚಿಸುವಿಕೆಯ ಲಾಕ್ ಅನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ."
+
+#: src/pulsecore/log.c:165
+#, fuzzy, c-format
+msgid "Failed to open target file '%s'."
+msgstr "ಧ್ವನಿ ಕಡತವನ್ನು ತೆರೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
+
+#: src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: src/pulsecore/log.c:651
+#, fuzzy
+msgid "Invalid log target."
+msgstr "[%s:%u] ಅಮಾನ್ಯವಾದ ದಾಖಲೆ ಗುರಿ '%s'."
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "ಆಂತರಿಕ ಆಡಿಯೊ"
+
+#: src/pulsecore/sink.c:3544
+msgid "Modem"
+msgstr "ಮಾಡೆಮ್"
+
+=======
 
 #: src/pulse/channelmap.c:161
 msgid "Top Rear Left"
@@ -1583,6 +1940,7 @@ msgstr "ಆಂತರಿಕ ಆಡಿಯೊ"
 msgid "Modem"
 msgstr "ಮಾಡೆಮ್"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/error.c:38
 msgid "OK"
 msgstr "ಸರಿ"
@@ -1855,7 +2213,11 @@ msgstr "ಸ್ಟ್ರೀಮನ್ನು ಬರಿದಾಗಿಸುವಲ್
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "ಸಂಪರ್ಕದ ವಿಫಲತೆ: %s"
@@ -2046,7 +2408,11 @@ msgstr ""
 "libpulse %s ನೊಂದಿಗೆ ಕಂಪೈಲ್ ಮಾಡಲಾಗಿದೆ\n"
 "libpulse %s ನೊಂದಿಗೆ ಜೋಡಿಸಲಾಗಿದೆ\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "ಅಮಾನ್ಯವಾದ ಕ್ಲೈಂಟಿನ ಹೆಸರು '%s'"
@@ -2118,7 +2484,11 @@ msgid ""
 msgstr ""
 "ಎಚ್ಚರಿಕೆ: ಸೂಚಿಸಲಾದ ನಮೂನೆ ವಿವರಣೆಯನ್ನು ಕಡತದಲ್ಲಿನ ವಿವರಣೆಯಿಂದ ತಿದ್ದಿಬರೆಯಲಾಗುತ್ತದೆ."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ಕಡತದಿಂದ ನಮೂನೆಯ ವಿವರಣೆಯನ್ನು ನಿರ್ಧರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
@@ -2155,7 +2525,11 @@ msgstr "ಪ್ಲೇಬ್ಯಾಕ್‌"
 msgid "Failed to set media name."
 msgstr "ಆಜ್ಞಾ ಸಾಲನ್ನು ಪಾರ್ಸ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() ವಿಫಲಗೊಂಡಿದೆ."
 
@@ -2163,11 +2537,19 @@ msgstr "pa_mainloop_new() ವಿಫಲಗೊಂಡಿದೆ."
 msgid "io_new() failed."
 msgstr "io_new() ವಿಫಲಗೊಂಡಿದೆ."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() ವಿಫಲಗೊಂಡಿದೆ."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() ವಿಫಲಗೊಂಡಿದೆ."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() ವಿಫಲಗೊಂಡಿದೆ: %s"
@@ -2176,6 +2558,23 @@ msgstr "pa_context_connect() ವಿಫಲಗೊಂಡಿದೆ: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() ವಿಫಲಗೊಂಡಿದೆ."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() ವಿಫಲಗೊಂಡಿದೆ."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() ವಿಫಲಗೊಂಡಿದೆ."
@@ -2191,6 +2590,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2202,7 +2602,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2238,7 +2642,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2246,6 +2654,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2255,6 +2674,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2270,7 +2690,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2338,19 +2762,31 @@ msgstr "ಪೋಲ್(): %s"
 msgid "read(): %s"
 msgstr "ಓದು(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "ಪ್ರಸಕ್ತ ಬಳಕೆಯಲ್ಲಿರುವುದು: %u ಖಂಡಗಳು ಒಟ್ಟು %s ಬೈಟ್‌ಗಳನ್ನು ಹೊಂದಿದೆ.\n"
 msgstr[1] "ಪ್ರಸಕ್ತ ಬಳಕೆಯಲ್ಲಿರುವುದು: %u ಖಂಡಗಳು ಒಟ್ಟು %s ಬೈಟ್‌ಗಳನ್ನು ಹೊಂದಿದೆ.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2362,22 +2798,38 @@ msgstr[1] ""
 "ಸಂಪೂರ್ಣ ಜೀವಿತಾವಧಿಯ ಸಮಯದಲ್ಲಿ ನಿಯೋಜಿಸಲಾಗಿದ್ದು: %u ಖಂಡಗಳು ಒಟ್ಟು %s ಬೈಟ್‌ಗಳನ್ನು "
 "ಹೊಂದಿದೆ.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "ನಮೂನೆಯ ಕ್ಯಾಶೆ ಗಾತ್ರ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "ಪರಿಚಾರಕದ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2388,7 +2840,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2411,6 +2867,21 @@ msgstr ""
 "ಪೂರ್ವನಿಯೋಜಿತ ಆಕರ: %s\n"
 "ಕುಕಿ: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2424,19 +2895,73 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ ಆಜ್ಞೆ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "ಲೈನ್-ಇನ್"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "ಅನಲಾಗ್ ಮೊನೊ"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2480,11 +3005,16 @@ msgstr "ಅನಲಾಗ್ ಮೊನೊ"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "ಸಿಂಕ್‌ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2523,37 +3053,66 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tಸಂಪರ್ಕಸ್ಥಾನಗಳು:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tಸಕ್ರಿಯ ಸಂಪರ್ಕಸ್ಥಾನ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tಸಂಪರ್ಕಸ್ಥಾನಗಳು:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "ಆಕರದ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2592,6 +3151,17 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "ಅನ್ವಯಿಸುವುದಿಲ್ಲ"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2601,11 +3171,16 @@ msgid "n/a"
 msgstr "ಅನ್ವಯಿಸುವುದಿಲ್ಲ"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "ಘಟಕದ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2622,12 +3197,20 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "ಕ್ಲೈಂಟಿನ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2642,12 +3225,20 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "ಕಾರ್ಡಿನ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2664,45 +3255,77 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tಪ್ರೊಫೈಲುಗಳು:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tಸಕ್ರಿಯ ಪ್ರೊಫೈಲುಗಳು: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "ಸಿಂಕ್‌ ಇನ್‌ಪುಟ್ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2740,12 +3363,20 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "ಆಕರದ ಔಟ್‌ಪುಟ್ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2783,12 +3414,20 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "ನಮೂನೆಯ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2818,21 +3457,49 @@ msgstr ""
 "\tಗುಣಗಳು:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "ವಿಫಲತೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2847,11 +3514,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "ನಮೂನೆಯನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2862,11 +3534,66 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "ನಮೂನೆಯನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "ಕಡತದ ಅಪ್ರಾಪ್ತ ಸಮಯದಲ್ಲಿ ಅಂತ್ಯ"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "ಕಡತದ ಅಪ್ರಾಪ್ತ ಸಮಯದಲ್ಲಿ ಅಂತ್ಯ"
@@ -2916,19 +3643,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "ಅಮಾನ್ಯವಾದ ಪರಿಚಾರಕ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT ದೊರೆತಿದೆ, ನಿರ್ಗಮಿಸುತ್ತಿದೆ."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "ಅಮಾನ್ಯವಾದ ಧ್ವನಿ ಪ್ರಮಾಣದ ವಿವರ"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT ದೊರೆತಿದೆ, ನಿರ್ಗಮಿಸುತ್ತಿದೆ."
@@ -2942,15 +3693,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "ಅಮಾನ್ಯವಾದ ಧ್ವನಿ ಪ್ರಮಾಣದ ವಿವರ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "ಅಮಾನ್ಯವಾದ ಧ್ವನಿ ಪ್ರಮಾಣದ ವಿವರ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2996,6 +3799,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3003,7 +3807,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3024,7 +3832,11 @@ msgstr ""
 "  -s, --server=SERVER                   ಸಂಪರ್ಕಸಾಧಿಸಬೇಕಿರುವ ಪರಿಚಾರಕದ ಹೆಸರು\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3035,16 +3847,55 @@ msgstr ""
 "libpulse %s ನೊಂದಿಗೆ ಕಂಪೈಲ್ ಮಾಡಲಾಗಿದೆ\n"
 "libpulse %s ನೊಂದಿಗೆ ಜೋಡಿಸಲಾಗಿದೆ\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "ಅಮಾನ್ಯವಾದ ಸ್ಟ್ರೀಮ್‌ನ ಹೆಸರು '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "ಲೋಡ್ ಮಾಡಬೇಕಿರುವ ಒಂದು ಕಡತದ ನಮೂನೆಯನ್ನು ಸೂಚಿಸಿ"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "ಧ್ವನಿ ಕಡತವನ್ನು ತೆರೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "ಎಚ್ಚರಿಕೆ: ಕಡತದಿಂದ ನಮೂನೆಯ ವಿವರವನ್ನು ನಿರ್ಧರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "ಚಲಾಯಿಸಲು ನೀವು ಒಂದು ನಮೂನೆಯ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "ತೆಗೆದು ಹಾಕಲು ನೀವು ಒಂದು ನಮೂನೆಯ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "ನೀವು ಒಂದು ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿಯನ್ನು ಹಾಗು ಒಂದು ಸಿಂಕ್‌ ಅನ್ನು ಸೂಚಿಸಬೇಕು."
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "ನೀವು ಒಂದು ಆಕರ ಔಟ್‌ಪುಟ್ ಸೂಚಿಯನ್ನು ಹಾಗು ಒಂದು ಆಕರವನ್ನು ಸೂಚಿಸಬೇಕು."
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "ನೀವು ಒಂದು ಘಟಕದ ಹೆಸರನ್ನು ಹಾಗು ಆರ್ಗುಮೆಂಟುಗಳನ್ನು ಸೂಚಿಸಬೇಕು."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "ಲೋಡ್ ಮಾಡಬೇಕಿರುವ ಒಂದು ಕಡತದ ನಮೂನೆಯನ್ನು ಸೂಚಿಸಿ"
@@ -3078,23 +3929,36 @@ msgid "You have to specify a module name and arguments."
 msgstr "ನೀವು ಒಂದು ಘಟಕದ ಹೆಸರನ್ನು ಹಾಗು ಆರ್ಗುಮೆಂಟುಗಳನ್ನು ಸೂಚಿಸಬೇಕು."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "ನೀವು ಒಂದು ಘಟಕ ಸೂಚಿಯನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "ನೀವು ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಸಿಂಕನ್ನು ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಒಂದು ಬೂಲಿಯನ್‌ ಮೌಲ್ಯವನ್ನು "
 "ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "ಅಮಾನ್ಯವಾದ ನಮೂನೆ ವಿವರ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3102,6 +3966,17 @@ msgstr ""
 "ನೀವು ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಆಕರವನ್ನು ಸೂಚಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಒಂದು ಬೂಲಿಯನ್‌ ಮೌಲ್ಯವನ್ನು "
 "ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "ಒಂದು ಕಾರ್ಡಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಪ್ರೊಫೈಲ್‌ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "ನೀವು ಒಂದು ಸಿಂಕಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "ಒಂದು ಕಾರ್ಡಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಪ್ರೊಫೈಲ್‌ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
@@ -3111,33 +3986,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "ನೀವು ಒಂದು ಸಿಂಕಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "ಚಲಾಯಿಸಲು ನೀವು ಒಂದು ನಮೂನೆಯ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "ನೀವು ಒಂದು ಆಕರದ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "ನೀವು ಒಂದು ಆಕರದ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "ನೀವು ಒಂದು ಘಟಕ ಸೂಚಿಯನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "ಚಲಾಯಿಸಲು ನೀವು ಒಂದು ನಮೂನೆಯ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕಾಗುತ್ತದೆ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "ನೀವು ಒಂದು ಸಿಂಕಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "ನೀವು ಒಂದು ಸಿಂಕಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "ನೀವು ಒಂದು ಘಟಕ ಸೂಚಿಯನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "ನೀವು ಒಂದು ಆಕರದ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "ನೀವು ಒಂದು ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿಯನ್ನು ಹಾಗು ಒಂದು ಸಿಂಕ್‌ ಅನ್ನು ಸೂಚಿಸಬೇಕು"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "ಅಮಾನ್ಯವಾದ ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿ"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "ನೀವು ಒಂದು ಆಕರದ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
@@ -3151,83 +4062,141 @@ msgid "Invalid sink input index"
 msgstr "ಅಮಾನ್ಯವಾದ ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿ"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "ನೀವು ಒಂದು ಆಕರ ಔಟ್‌ಪುಟ್ ಸೂಚಿಯನ್ನು ಹಾಗು ಒಂದು ಆಕರವನ್ನು ಸೂಚಿಸಬೇಕು."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "ಅಮಾನ್ಯವಾದ ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ನೀವು ಒಂದು ಸಿಂಕಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "ಅಮಾನ್ಯವಾದ ನಮೂನೆ ವಿವರ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ನೀವು ಒಂದು ಆಕರದ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "ನೀವು ಒಂದು ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿಯನ್ನು ಹಾಗು ಒಂದು ಸಿಂಕ್‌ ಅನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "ಅಮಾನ್ಯವಾದ ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿ ವಿವರ"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "ಅಮಾನ್ಯವಾದ ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿ ವಿವರ"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "ನೀವು ಒಂದು ಆಕರದ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "ಅಮಾನ್ಯವಾದ ಸಿಂಕ್ ಇನ್‌ಪುಟ್ ಸೂಚಿ ವಿವರ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "ನೀವು ಒಂದು ಸಿಂಕಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "ನೀವು ಒಂದು ಸಿಂಕಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "ಒಂದು ಕಾರ್ಡಿನ ಹೆಸರು/ಸೂಚಿಯನ್ನು ಹಾಗು ಪ್ರೊಫೈಲ್‌ ಹೆಸರನ್ನು ಸೂಚಿಸಬೇಕು"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "ಮಾನ್ಯವಾದ ಯಾವುದೆ ಆಜ್ಞೆಯನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ."
 
diff --git a/po/ko.po b/po/ko.po
index c3be3e475..ded1809bd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,9 +6,15 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-06-22 10:04+0000\n"
+"Last-Translator: simmon <simmon@nplob.com>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2023-07-19 15:21+0000\n"
 "Last-Translator: 김인수 <simmon@nplob.com>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: Korean <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/ko/>\n"
 "Language: ko\n"
@@ -16,7 +22,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.7\n"
+=======
 "X-Generator: Weblate 4.18.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -92,6 +102,68 @@ msgstr ""
 "%s [options]\n"
 "\n"
 "명령:\n"
+<<<<<<< HEAD
+" -h, --help 도움말을 표시\n"
+" --version 버전를 표시\n"
+" --dump-conf 기본 설정을 덤프\n"
+" --dump-modules 사용 가능한 모듈 목록을 덤프\n"
+" --dump-resample-methods 사용 가능한 리샘플링 방법을 덤프\n"
+" --cleanup-shm 이전 공유 메모리 세그먼트를 삭제\n"
+" --start 데몬이 실행하지 않는 경우 데몬을 시작\n"
+" -k --kill 실행중인 데몬을 종료\n"
+" --check 실행중인 데몬을 확인 (종료 코드를 반환할 경우에만)\n"
+"\n"
+"옵션:\n"
+" --system[=BOOL] 시스템 전역 인스턴스로 실행\n"
+" -D, --daemonize[=BOOL] 시작 후 데몬화\n"
+" --fail[=BOOL] 시작 실패 시 종료\n"
+" --high-priority[=BOOL] 높고 좋은 수준 설정 시도\n"
+" (root로만 사용 가능, SUID 또는\n"
+" 상승된 RLIMIT_NICE에서)\n"
+" --realtime[=BOOL] 실시간 예약 활성화 시도\n"
+" (root로망 사용 가능, SUID 또는\n"
+" 상승된 RLIMIT_RTPRIO에서)\n"
+" --disallow-module-loading[=BOOL] 시작 후 사용자 요청 모듈 로드/언로드를\n"
+" 허용하지 않음\n"
+" --disallow-exit[=BOOL] 사용자 요청 종료를 허용하지 않음\n"
+" --exit-idle-time=SECS 유휴 시간 및 지정된 시간 후\n"
+" 데몬을 종료\n"
+" --scache-idle-time=SECS 유휴 시간 및 지정된 시간 후\n"
+" 자동 로드된 샘플을 언로드\n"
+" --log-level[=LEVEL] 상세 설명 수준을 올리거나 설정\n"
+" -v 상세 설명 수준을 올림\n"
+" --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+" 로그 대상을 지정\n"
+" --log-meta[=BOOL] 로그 메세지에 코드 위치를 포함\n"
+" --log-time[=BOOL] 로그 메세지에 시간표기를 포함\n"
+" --log-backtrace=FRAMES 로그 메세지에 역추적을 포함\n"
+" -p, --dl-search-path=PATH 동적 공유 객체 (plugins)에\n"
+" 검색 경로를 설정\n"
+" --resample-method=METHOD 지정한 리샘플링 방법을 사용\n"
+" (사용 가능한 값은 --dump-resample-methods\n"
+" 에서 참조)\n"
+" --use-pid-file[=BOOL] PID 파일 생성\n"
+" --no-cpu-limit[=BOOL] 지원하는 플랫폼에 CPU 로드 제한기를\n"
+" 설치하지 않음.\n"
+" --disable-shm[=BOOL] 공유 메모리 지원을 비활성화함.\n"
+"\n"
+"시작 스크립트:\n"
+" -L, --load=\"MODULE ARGUMENTS\" 지정된 인수와 함께 지정된 플러그인\n"
+" 모듈을 적재\n"
+" -F, --file=FILENAME 지정한 스크립트를 실행\n"
+" -C 시작 후 실행 중인 TTY에서 명령행을\n"
+" 열음\n"
+"\n"
+" -n 기본 스크립트 파일을 적재하지 않음\n"
+
+#: src/daemon/cmdline.c:246
+msgid "--daemonize expects boolean argument"
+msgstr "--daemonize는 부울 인수를 예상합니다"
+
+#: src/daemon/cmdline.c:254
+msgid "--fail expects boolean argument"
+msgstr "--fail은 부울 인수를 예상합니다"
+=======
 "  -h, --help                            도움말을 표시\n"
 "      --version                         버전을 표시\n"
 "      --dump-conf                       기본 구성 덤프\n"
@@ -158,10 +230,46 @@ msgstr "--daemonize 에는 부울 인자 값이 필요합니다"
 #: src/daemon/cmdline.c:254
 msgid "--fail expects boolean argument"
 msgstr "--fail 에는 부울 인자 값이 필요합니다"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
+<<<<<<< HEAD
+"of debug, info, notice, warn, error)."
+msgstr ""
+"--log-level은 로그 수준 논의가 예상됩니다 (0..4 숫자 범위 내의 수 또는 디버그"
+"중의 하나, 정보, 알림, 경고, 오류)."
+
+#: src/daemon/cmdline.c:277
+msgid "--high-priority expects boolean argument"
+msgstr "--high-priority는 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:285
+msgid "--realtime expects boolean argument"
+msgstr "--realtime은 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:293
+msgid "--disallow-module-loading expects boolean argument"
+msgstr "--disallow-module-loading는 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:301
+msgid "--disallow-exit expects boolean argument"
+msgstr "--disallow-exit는 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:309
+msgid "--use-pid-file expects boolean argument"
+msgstr "--use-pid-file는 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:328
+msgid ""
+"Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"잘못된 로그 대상: 'syslog', 'stderr','auto' 또는 유효한 파일 이름 'file:"
+"<path>', 'newfile:<path>' 중에 하나를 사용하십시오."
+
+=======
 "of error, warn, notice, info, debug)."
 msgstr ""
 "--log-level 에는 로그 수준 인자 값이 필요합니다 (0~4 숫자 범위 또는 오류, 경"
@@ -195,11 +303,24 @@ msgstr ""
 "잘못된 로그 대상: 'syslog', 'journal', 'stderr' 또는 'auto' 또는 유효한 파일 "
 "이름 'file:<path>', 'newfile:<path>'를 사용하십시오."
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/daemon/cmdline.c:330
 msgid ""
 "Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
 "name 'file:<path>', 'newfile:<path>'."
 msgstr ""
+<<<<<<< HEAD
+"잘못된 로그 대상: 'syslog', 'stderr','auto' 또는 유효한 파일 이름 'file:"
+"<path>', 'newfile:<path>' 중에 하나를 사용하십시오."
+
+#: src/daemon/cmdline.c:338
+msgid "--log-time expects boolean argument"
+msgstr "--log-time은 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:346
+msgid "--log-meta expects boolean argument"
+msgstr "--log-meta는 boolean 인수를 사용합니다"
+=======
 "잘못된 로그 대상: 'syslog', 'stderr' 또는 'auto' 또는 유효한 파일 이름 'file:"
 "<path>', 'newfile:<path>'를 사용하십시오."
 
@@ -210,6 +331,7 @@ msgstr "--log-time 에는 부울 인자 값이 필요합니다"
 #: src/daemon/cmdline.c:346
 msgid "--log-meta expects boolean argument"
 msgstr "--log-meta 에는 부울 인자 값이 필요합니다"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:366
 #, c-format
@@ -218,6 +340,21 @@ msgstr "잘못된 리샘플링 방식 '%s'."
 
 #: src/daemon/cmdline.c:373
 msgid "--system expects boolean argument"
+<<<<<<< HEAD
+msgstr "--system는 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:381
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "--no-cpu-limit는 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:389
+msgid "--disable-shm expects boolean argument"
+msgstr "--disable-shm는 boolean 인수를 사용합니다"
+
+#: src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr "--enable-memfd은 boolean 인수를 예상합니다"
+=======
 msgstr "--system 에는 부울 인자 값이 필요합니다"
 
 #: src/daemon/cmdline.c:381
@@ -231,6 +368,7 @@ msgstr "--disable-shm 에는 부울 인자 값이 필요합니다"
 #: src/daemon/cmdline.c:397
 msgid "--enable-memfd expects boolean argument"
 msgstr "--enable-memfd는 부울 인수가 필요합니다"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/daemon-conf.c:270
 #, c-format
@@ -302,7 +440,11 @@ msgid ""
 "The specified default channel map has a different number of channels than "
 "the specified default number of channels."
 msgstr ""
+<<<<<<< HEAD
+"지정된 기본 채널 맵은 지정된 기본 채널 수와는 다른 채널 수를 가지고 있습니다."
+=======
 "지정 기본 채널 맵은 지정 기본 채널 수와는 다른 채널 수를 가지고 있습니다."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/daemon-conf.c:788
 #, c-format
@@ -323,6 +465,783 @@ msgstr "사용 가능한 모듈 정보 없음\n"
 #, c-format
 msgid "Version: %s\n"
 msgstr "버전: %s\n"
+<<<<<<< HEAD
+
+#: src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Description: %s\n"
+msgstr "설명: %s\n"
+
+#: src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Author: %s\n"
+msgstr "개발자: %s\n"
+
+#: src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Usage: %s\n"
+msgstr "사용법: %s\n"
+
+#: src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "한 번 로딩하기: %s\n"
+
+#: src/daemon/dumpmodules.c:72
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "지원 중지 경고: %s\n"
+
+#: src/daemon/dumpmodules.c:76
+#, c-format
+msgid "Path: %s\n"
+msgstr "경로: %s\n"
+
+#: src/daemon/ltdl-bind-now.c:75
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "모듈 열기 실패 '%s: %s"
+
+#: src/daemon/ltdl-bind-now.c:126
+msgid "Failed to find original lt_dlopen loader."
+msgstr "기존 lt_dlopen 로더를 찾는데 실패했습니다."
+
+#: src/daemon/ltdl-bind-now.c:131
+msgid "Failed to allocate new dl loader."
+msgstr "새 dl 로더를 할당하는데 실패했습니다."
+
+#: src/daemon/ltdl-bind-now.c:144
+msgid "Failed to add bind-now-loader."
+msgstr "bind-now-loader를 추가하는데 실패했습니다."
+
+#: src/daemon/main.c:265
+#, c-format
+msgid "Failed to find user '%s'."
+msgstr "사용자 '%s'를 찾을 수 없습니다."
+
+#: src/daemon/main.c:270
+#, c-format
+msgid "Failed to find group '%s'."
+msgstr "그룹 '%s'를 찾을 수 없습니다."
+
+#: src/daemon/main.c:279
+#, c-format
+msgid "GID of user '%s' and of group '%s' don't match."
+msgstr "사용자 '%s'의 GID와 그룹 '%s'가 일치하지 않습니다."
+
+#: src/daemon/main.c:284
+#, c-format
+msgid "Home directory of user '%s' is not '%s', ignoring."
+msgstr "사용자 '%s'의 홈 디렉토리가 '%s'가 아닙니다, 무시됨."
+
+#: src/daemon/main.c:287 src/daemon/main.c:292
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "'%s' 생성 실패: %s"
+
+#: src/daemon/main.c:299
+#, c-format
+msgid "Failed to change group list: %s"
+msgstr "그룹 리스트 변경 실패: %s"
+
+#: src/daemon/main.c:315
+#, c-format
+msgid "Failed to change GID: %s"
+msgstr "GID 변경 실패: %s"
+
+#: src/daemon/main.c:331
+#, c-format
+msgid "Failed to change UID: %s"
+msgstr "UID 변경 실패: %s"
+
+#: src/daemon/main.c:360
+msgid "System wide mode unsupported on this platform."
+msgstr "시스템 전역 모드는 이 플랫폼에서 지원되지 않습니다."
+
+#: src/daemon/main.c:650
+msgid "Failed to parse command line."
+msgstr "명령어 행 분석 실패."
+
+#: src/daemon/main.c:689
+msgid ""
+"System mode refused for non-root user. Only starting the D-Bus server lookup "
+"service."
+msgstr ""
+"비 root 사용자에 대해 시스템 모드는 거부되었습니다. D-Bus 서버 검색 서비스만 "
+"시작합니다."
+
+#: src/daemon/main.c:788
+#, c-format
+msgid "Failed to kill daemon: %s"
+msgstr "데몬 종료 실패: %s"
+
+#: src/daemon/main.c:817
+msgid ""
+"This program is not intended to be run as root (unless --system is "
+"specified)."
+msgstr ""
+"프로그램이 root로 실행되지 않습니다. (실행하려면 --system을 명기하십시오)."
+
+#: src/daemon/main.c:820
+msgid "Root privileges required."
+msgstr "Root 권한이 필요합니다."
+
+#: src/daemon/main.c:827
+msgid "--start not supported for system instances."
+msgstr "--start는 시스템 인스턴스에 대해 지원되지 않습니다."
+
+#: src/daemon/main.c:867
+#, c-format
+msgid "User-configured server at %s, refusing to start/autospawn."
+msgstr "%s에서 사용자 설정한 서버, start/autospawn을 거부하고 있습니다."
+
+#: src/daemon/main.c:873
+#, c-format
+msgid ""
+"User-configured server at %s, which appears to be local. Probing deeper."
+msgstr "%s에 사용자가 설정한 서버, 이는 로컬에 있습니다. 상세히 조사합니다."
+
+#: src/daemon/main.c:878
+msgid "Running in system mode, but --disallow-exit not set."
+msgstr ""
+"시스템 모드에서 실행중입니다. 하지만 --disallow-exit가 설정되지 않았습니다."
+
+#: src/daemon/main.c:881
+msgid "Running in system mode, but --disallow-module-loading not set."
+msgstr ""
+"시스템 모드에서 실행 중입니다. 하지만 --disallow-module-loading이 설정되어 있"
+"지 않습니다."
+
+#: src/daemon/main.c:884
+msgid "Running in system mode, forcibly disabling SHM mode."
+msgstr "시스템 모드에서 실행 중입니다. 강제로 SHM 모드를 비활성화합니다."
+
+#: src/daemon/main.c:889
+msgid "Running in system mode, forcibly disabling exit idle time."
+msgstr "시스템 모드에서 실행 중입니다. 강제로 exit 유휴 시간을 비활성화합니다."
+
+#: src/daemon/main.c:922
+msgid "Failed to acquire stdio."
+msgstr "표준 입출력을 얻을 수 없습니다."
+
+#: src/daemon/main.c:928 src/daemon/main.c:999
+#, c-format
+msgid "pipe() failed: %s"
+msgstr "pipe() 실패: %s"
+
+#: src/daemon/main.c:933 src/daemon/main.c:1004
+#, c-format
+msgid "fork() failed: %s"
+msgstr "fork() 실패: %s"
+
+#: src/daemon/main.c:948 src/daemon/main.c:1019 src/utils/pacat.c:562
+#, c-format
+msgid "read() failed: %s"
+msgstr "read() 실패: %s"
+
+#: src/daemon/main.c:954
+msgid "Daemon startup failed."
+msgstr "데몬 시작에 실패했습니다."
+
+#: src/daemon/main.c:987
+#, c-format
+msgid "setsid() failed: %s"
+msgstr "setsid() 실패: %s"
+
+#: src/daemon/main.c:1119
+msgid "Failed to get machine ID"
+msgstr "머신 ID 가져오기 실패"
+
+#: src/daemon/main.c:1145
+msgid ""
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\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"
+"시스템 모드가 좋지 않은 이유에 대해서는 다음 문서를 확인하시기 바랍니다. "
+"http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/."
+
+#: src/daemon/main.c:1161
+msgid "pa_pid_file_create() failed."
+msgstr "pa_pid_file_create() 실패."
+
+#: src/daemon/main.c:1193
+msgid "pa_core_new() failed."
+msgstr "pa_core_new() 실패."
+
+#: src/daemon/main.c:1268
+msgid "command line arguments"
+msgstr "명령 줄 인수"
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+"시작 명령을 실행 할 때에 오류로 인해 데몬을 초기화 할 수 없습니다. 명령 소"
+"스: %s"
+
+#: src/daemon/main.c:1280
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr "아무런 모듈 없이 데몬이 실행되었습니다. 동작하지 않습니다."
+
+#: src/daemon/pulseaudio.desktop.in:4
+msgid "PulseAudio Sound System"
+msgstr "펄스오디오 사운드 시스템"
+
+#: src/daemon/pulseaudio.desktop.in:5
+msgid "Start the PulseAudio Sound System"
+msgstr "펄스오디오 사운드 시스템을 시작합니다"
+
+#: src/modules/alsa/alsa-mixer.c:2708
+msgid "Input"
+msgstr "입력"
+
+#: src/modules/alsa/alsa-mixer.c:2709
+msgid "Docking Station Input"
+msgstr "도킹 스테이션 입력"
+
+#: src/modules/alsa/alsa-mixer.c:2710
+msgid "Docking Station Microphone"
+msgstr "도킹 스테이션 마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2711
+msgid "Docking Station Line In"
+msgstr "도킹스테이션 라인 입력"
+
+#: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
+msgid "Line In"
+msgstr "라인 입력"
+
+#: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+msgid "Microphone"
+msgstr "마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2714 src/modules/alsa/alsa-mixer.c:2798
+msgid "Front Microphone"
+msgstr "전면 마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2715 src/modules/alsa/alsa-mixer.c:2799
+msgid "Rear Microphone"
+msgstr "후면 마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2716
+msgid "External Microphone"
+msgstr "외부 마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2717 src/modules/alsa/alsa-mixer.c:2801
+msgid "Internal Microphone"
+msgstr "내부 마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+#: src/utils/pactl.c:295
+msgid "Radio"
+msgstr "라디오"
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:296
+msgid "Video"
+msgstr "비디오"
+
+#: src/modules/alsa/alsa-mixer.c:2720
+msgid "Automatic Gain Control"
+msgstr "자동 게인 컨트롤"
+
+#: src/modules/alsa/alsa-mixer.c:2721
+msgid "No Automatic Gain Control"
+msgstr "자동 게인 컨트롤 없음"
+
+#: src/modules/alsa/alsa-mixer.c:2722
+msgid "Boost"
+msgstr "부스트"
+
+#: src/modules/alsa/alsa-mixer.c:2723
+msgid "No Boost"
+msgstr "부스트 없음"
+
+#: src/modules/alsa/alsa-mixer.c:2724
+msgid "Amplifier"
+msgstr "증폭"
+
+#: src/modules/alsa/alsa-mixer.c:2725
+msgid "No Amplifier"
+msgstr "증폭 없음"
+
+#: src/modules/alsa/alsa-mixer.c:2726
+msgid "Bass Boost"
+msgstr "베이스 부스트"
+
+#: src/modules/alsa/alsa-mixer.c:2727
+msgid "No Bass Boost"
+msgstr "베이스 부스트 없음"
+
+#: src/modules/alsa/alsa-mixer.c:2728
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+msgid "Speaker"
+msgstr "스피커"
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:286
+msgid "Headphones"
+msgstr "헤드폰"
+
+#: src/modules/alsa/alsa-mixer.c:2796
+msgid "Analog Input"
+msgstr "아날로그 입력"
+
+#: src/modules/alsa/alsa-mixer.c:2800
+msgid "Dock Microphone"
+msgstr "도킹스테이션 마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2802
+msgid "Headset Microphone"
+msgstr "후면 마이크"
+
+#: src/modules/alsa/alsa-mixer.c:2806
+msgid "Analog Output"
+msgstr "아날로그 출력"
+
+#: src/modules/alsa/alsa-mixer.c:2808
+msgid "Headphones 2"
+msgstr "헤드폰 2"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+msgid "Headphones Mono Output"
+msgstr "헤드폰 모노 출력"
+
+#: src/modules/alsa/alsa-mixer.c:2810
+msgid "Line Out"
+msgstr "라인 출력"
+
+#: src/modules/alsa/alsa-mixer.c:2811
+msgid "Analog Mono Output"
+msgstr "아날로그 모노 출력"
+
+#: src/modules/alsa/alsa-mixer.c:2812
+msgid "Speakers"
+msgstr "스피커"
+
+#: src/modules/alsa/alsa-mixer.c:2813
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
+
+#: src/modules/alsa/alsa-mixer.c:2814
+msgid "Digital Output (S/PDIF)"
+msgstr "디지털 출력 (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2815
+msgid "Digital Input (S/PDIF)"
+msgstr "디지털 입력 (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2816
+msgid "Multichannel Input"
+msgstr "다채널 입력"
+
+#: src/modules/alsa/alsa-mixer.c:2817
+msgid "Multichannel Output"
+msgstr "다채널 출력"
+
+#: src/modules/alsa/alsa-mixer.c:2818
+msgid "Game Output"
+msgstr "게임 출력"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+msgid "Chat Output"
+msgstr "대화 출력"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+msgstr "대화 입력"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+msgid "Virtual Surround 7.1"
+msgstr "가상 서라운드 싱크"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "아날로그 모노"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+msgid "Analog Mono (Left)"
+msgstr "아날로그 모노 (왼쪽)"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+msgid "Analog Mono (Right)"
+msgstr "아날로그 모노 (오른쪽)"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "아날로그 스테레오"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "모노"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "스테레오"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr "헤드셋"
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+msgid "Speakerphone"
+msgstr "스피커폰"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr "멀티채널"
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "아날로그 서라운드 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "아날로그 서라운드 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "아날로그 서라운드 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "아날로그 서라운드 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "아날로그 서라운드 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "아날로그 서라운드 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "아날로그 서라운드 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "아날로그 서라운드 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "아날로그 서라운드 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "아날로그 서라운드 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "아날로그 서라운드 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "디지털 스테레오 (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "디지털 서라운드 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "디지털 서라운드 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "디지털 서라운드 5.1 (IEC958/DTS)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "디지털 스테레오 (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "디지털 서라운드 5.1 (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr "대화"
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr "게임"
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "아날로그 양방향 모노"
+
+#: src/modules/alsa/alsa-mixer.c:4733
+msgid "Analog Stereo Duplex"
+msgstr "아날로그 양방향 스테레오"
+
+#: src/modules/alsa/alsa-mixer.c:4736
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "아날로그 양방향 스테레오 (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr "멀티채널 듀플렉스"
+
+#: src/modules/alsa/alsa-mixer.c:4738
+msgid "Stereo Duplex"
+msgstr "스테레오 듀플렉스"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr "모노 Chat + 7.1 Surround"
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+msgid "Off"
+msgstr "끄기"
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, c-format
+msgid "%s Output"
+msgstr "%s 출력"
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, c-format
+msgid "%s Input"
+msgstr "%s 입력"
+
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+#, 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 ""
+"ALSA가 장치에 새 데이터를 쓰도록 재촉했지만 쓸 수 있는 것이 없습니다!\n"
+"이는 대부분 ALSA 드라이버 '%s'의 버그입니다. 이 문제를 ALSA 개발자에게 보고하"
+"십시오.\n"
+"POLLOUT 세트로 불러 오려했지만 결과적으로 snd_pcm_avail()이 0 또는 다른 값 < "
+"min_avail을 반환했습니다."
+
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, 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 ""
+"ALSA가 장치에 새 데이터를 읽도록 재촉했지만 읽을 수 있는 것이 없습니다!\n"
+"이는 대부분 ALSA 드라이버 '%s'의 버그입니다. 이 문제를 ALSA 개발자에게 보고하"
+"십시오.\n"
+"POLLIN 세트로 불러오려했지만 결과적으로 snd_pcm_avail()이 0 또는 다른 값 < "
+"min_avail을 반환했습니다."
+
+#: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_avail()이 %lu 바이트 (%lu ms)의 매우 큰 값을 반환했습니다.\n"
+"ALSA 드라이버 '%s'의 오류일 수 있습니다. ALSA 개발자에게 이 문제를 보고해주시"
+"기 바랍니다."
+
+#: src/modules/alsa/alsa-util.c:1249
+#, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay()가 %li 바이트 (%s%lu ms)의 매우 큰 값을 반환했습니다.\n"
+"ALSA 드라이버 '%s'의 오류일 수 있습니다. ALSA 개발자에게 이 문제를 보고해주시"
+"기 바랍니다."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, 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 ""
+"snd_pcm_avail_delay()가 이상한 값을 반환했습니다: 지연 시간 %lu은 사용 가능"
+"한 시간 %lu 보다 작습니다.\n"
+"ALSA 드라이버 '%s'의 오류일 수 있습니다. ALSA 개발자에게 이 문제를 보고해 주"
+"시기 바랍니다."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin()이 %lu 바이트 (%lu ms)의 매우 큰 값을 반환했습니다.\n"
+"ALSA 드라이버 '%s'의 오류일 수 있습니다. ALSA 개발자에게 이 문제를 보고해 주"
+"시기 바랍니다."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "블루투스 출력"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "블루투스 출력"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "핸즈프리"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "헤드폰"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "이동식"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "자동차"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "하이파이"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "전화기"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "고 충실도 재생 (A2DP Sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "고 충실도 순간찍기 (A2DP Source)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "헤드셋 헤드 유닛 (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "헤드셋 오디오 게이트웨어 (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "핸즈프리 헤드 유닛 (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "블루투스 핸즈프리 게이트웨이 (HFP)"
+
+#: src/modules/echo-cancel/module-echo-cancel.c:59
+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> use_master_format=<yes "
+"or no> "
+msgstr ""
+"source_name=<소스의 이름> source_properties=<소스에 속성들을 지정> "
+"source_master=<필터를 적용할 소스의 이름> sink_name=<싱크의 이름> "
+"sink_properties=<싱크에 속성들을 지정> sink_master=<필터를 적용할 싱크의 이름"
+"> adjust_time=<샘플 레이트 재조정을 몇 초 단위로 할 것인지 지정> "
+"adjust_threshold=<드리프트가 몇 ms 이후부터 재조정을 할 것인지 지정> format=<"
+"샘플 형식> rate=<샘플 레이트> channels=<채널 수> channel_map=<채널 맵> "
+"aec_method=<사용 할 구현체> aec_args=<AEC 엔진의 인자들> save_aec=<AEC 데이터"
+"를 /tmp 안에 저장> autoloaded=<이 모듈이 자동으로 로드된다면 설정하십시오> "
+"use_volume_sharing=<yes 또는 no> "
+
+#. add on profile
+#: src/modules/macosx/module-coreaudio-device.c:825
+msgid "On"
+msgstr "활성"
+
+#: src/modules/module-allow-passthrough.c:71
+#: src/modules/module-always-sink.c:80
+msgid "Dummy Output"
+msgstr "가짜 출력"
+
+#: src/modules/module-always-sink.c:34
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr "빈 싱크를 포함하여 최소한 하나 이상의 싱크가 존재해야 합니다"
+
+#: src/modules/module-always-source.c:35
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr "빈 싱크를 포함하여 최소한 하나 이상의 싱크가 존재해야 합니다"
+
+#: src/modules/module-equalizer-sink.c:68
+msgid "General Purpose Equalizer"
+msgstr "일반적 목적의 이퀼라이저"
+
+#: src/modules/module-equalizer-sink.c:72
+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=<싱크의 이름> sink_properties=<싱크에 속성들을 지정> sink_master=<"
+"연결할 싱크> format=<샘플 형식> rate=<샘플 레이트> channels=<채널 수> "
+"channel_map=<채널 맵> autoloaded=<이 모듈이 자동으로 로드된다면 설정하십시오"
+"> use_volume_sharing=<yes 또는 no> "
+
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr "고속퓨리에변환 기반 이퀄라이저 동작 %s"
+
+=======
 
 #: src/daemon/dumpmodules.c:65
 #, c-format
@@ -1099,6 +2018,7 @@ msgstr ""
 msgid "FFT based equalizer on %s"
 msgstr "고속퓨리에변환 기반 이퀄라이저 동작 %s"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/module-filter-apply.c:47
 msgid "autoclean=<automatically unload unused filters?>"
 msgstr "autoclean=<사용되지 않는 필터들을 자동으로 언로드>"
@@ -1131,11 +2051,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "클럭 사용 빈 싱크"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "빈 출력"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "빈 출력"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "포맷 설정 실패: 잘못된 포맷 문자열 %s"
@@ -1158,14 +2086,24 @@ msgstr "호스트 @HOSTNAME@의 오디오"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "%s@%s 위한 터널"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "%s/%s가는 터널"
@@ -1189,6 +2127,17 @@ msgstr ""
 "형식> rate=<샘플 레이트> channels=<채널 수> channel_map=<채널 맵> "
 "use_volume_sharing=<yes 또는 no> force_flat_volume=<yes 또는 no> hrir=/path/"
 "to/left_hrir.wav autoloaded=<이 모듈이 자동으로 로드된다면 설정하십시오> "
+<<<<<<< HEAD
+
+#: src/modules/raop/module-raop-discover.c:295
+msgid "Unknown device model"
+msgstr "알 수 없는 장치 모델"
+
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr "RAOP 표준 프로파일"
+
+=======
 
 #: src/modules/raop/module-raop-discover.c:295
 msgid "Unknown device model"
@@ -1198,6 +2147,7 @@ msgstr "알 수 없는 장치 모델"
 msgid "RAOP standard profile"
 msgstr "RAOP 표준 프로파일"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
 msgstr "펄스오디오 사운드 서버"
@@ -1405,7 +2355,10 @@ msgstr "상단 후면 오른쪽"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(잘못됨)"
 
@@ -1479,9 +2432,15 @@ 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 ""
+<<<<<<< HEAD
+"XDG_RUNTIME_DIR (%s)는 우리(uid %d)가 아니라 uid %d가 소유합니다! (기본적인 "
+"통신규약을 통해 비-root가 PluseAudio에 root 사용자로 연결을 시도할 때에 예를 "
+"들어 발생 할 수 있습니다. 그렇게 하지 않습니다.)"
+=======
 "XDG_RUNTIME_DIR (%s)은 우리(uid %d)가 아니라 uid %d가 소유합니다! (자체 프로"
 "토콜로 비 루트 펄스오디오 사용자가 루트 사용자 권한으로 연결할 때 이 문제가 "
 "일어납니다. 그렇게 하지 마십시오.)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulsecore/core-util.h:97
 msgid "yes"
@@ -1512,11 +2471,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "잘못된 기록 대상."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "내장 오디오"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "내장 오디오"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "모뎀"
 
@@ -1590,7 +2557,7 @@ msgstr "자료 없음"
 
 #: src/pulse/error.c:55
 msgid "Incompatible protocol version"
-msgstr "호환되지 않는 프로토콜 버전"
+msgstr "호환되지 않는 통신규약 버전"
 
 #: src/pulse/error.c:56
 msgid "Too large"
@@ -1791,7 +2758,11 @@ msgstr "모니터 스트림 설정에 실패하였습니다: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() 실패: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "연결 실패: %s"
@@ -1799,12 +2770,21 @@ msgstr "연결 실패: %s"
 #: src/utils/pacat.c:557
 msgid "Got EOF."
 msgstr "EOF 받음."
+<<<<<<< HEAD
 
 #: src/utils/pacat.c:581
 #, c-format
 msgid "pa_stream_write() failed: %s"
 msgstr "pa_stream_write() 실패: %s"
 
+=======
+
+#: src/utils/pacat.c:581
+#, c-format
+msgid "pa_stream_write() failed: %s"
+msgstr "pa_stream_write() 실패: %s"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:605
 #, c-format
 msgid "write() failed: %s"
@@ -1846,9 +2826,13 @@ msgid ""
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -d, --device=DEVICE                   The name of the sink/source to "
+<<<<<<< HEAD
+"connect to\n"
+=======
 "connect to. The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and "
 "@DEFAULT_MONITOR@ can be used to specify the default sink, source and "
 "monitor respectively.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 "      --stream-name=NAME                How to call this stream on the "
@@ -1900,6 +2884,59 @@ msgstr ""
 "%s [options]\n"
 "%s\n"
 "\n"
+<<<<<<< HEAD
+"명령:\n"
+" -h, --help 도움말을 표시\n"
+" --version 버전을 표시\n"
+" --dump-conf 기본 설정을 덤프\n"
+" --dump-modules 사용 가능한 모듈 목록을 덤프\n"
+" --dump-resample-methods 사용 가능한 리샘플링 방법을 덤프\n"
+" --cleanup-shm 이전 공유 메모리 세그먼트를 삭제\n"
+" --start 데몬이 실행하지 않는 경우 데몬을 시작\n"
+" -k --kill 실행중인 데몬을 종료\n"
+" --check 실행중인 데몬을 확인 (종료 코드를 반환할 경우에만)\n"
+"\n"
+"옵션:\n"
+" --system[=BOOL] 시스템 전역 인스턴스로 실행\n"
+" -D, --daemonize[=BOOL] 시작 후 데몬화\n"
+" --fail[=BOOL] 시작 실패 시 종료\n"
+" --high-priority[=BOOL] 높고 좋은 수준 설정 시도\n"
+" (root로만 사용 가능, SUID 또는\n"
+" 상승된 RLIMIT_NICE에서)\n"
+" --realtime[=BOOL] 실시간 예약 활성화 시도\n"
+" (root로망 사용 가능, SUID 또는\n"
+" 상승된 RLIMIT_RTPRIO에서)\n"
+" --disallow-module-loading[=BOOL] 시작 후 사용자 요청 모듈 로드/언로드를\n"
+" 허용하지 않음\n"
+" --disallow-exit[=BOOL] 사용자 요청 종료를 허용하지 않음\n"
+" --exit-idle-time=SECS 유휴 시간 및 지정된 시간 후\n"
+" 데몬을 종료\n"
+" --scache-idle-time=SECS 유휴 시간 및 지정된 시간 후\n"
+" 자동 로드된 샘플을 언로드\n"
+" --log-level[=LEVEL] 상세 설명 수준을 올리거나 설정\n"
+" -v 상세 설명 수준을 올림\n"
+" --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+" 로그 대상을 지정\n"
+" --log-meta[=BOOL] 로그 메세지에 코드 위치를 포함\n"
+" --log-time[=BOOL] 로그 메세지에 타임스탬프를 포함\n"
+" --log-backtrace=FRAMES 로그 메세지에 역추적을 포함\n"
+" -p, --dl-search-path=PATH 동적 공유 객체 (plugins)에\n"
+" 검색 경로를 설정\n"
+" --resample-method=METHOD 지정한 리샘플링 방법을 사용\n"
+" (사용 가능한 값은 --dump-resample-methods\n"
+" 에서 참조)\n"
+" --use-pid-file[=BOOL] PID 파일 생성\n"
+" --no-cpu-limit[=BOOL] 지원하는 플랫폼에 CPU 로드 제한기를\n"
+" 설치하지 않음.\n"
+" --disable-shm[=BOOL] 공유 메모리 지원을 비활성화함.\n"
+"시작 스크립트:\n"
+" -L, --load=\"MODULE ARGUMENTS\" 지정된 인수와 함께 지정된 플러그인\n"
+" 모듈을 적재\n"
+" -F, --file=FILENAME 지정한 스크립트를 실행\n"
+" -C 시작 후 실행 중인 TTY에서 명령행을\n"
+" 열음\n"
+" -n 기본 스크립트 파일을 적재하지 않음\n"
+=======
 "  -h, --help                            이 도움말을 표시합니다\n"
 "      --version                         버전을 표시합니다\n"
 "\n"
@@ -1955,6 +2992,7 @@ msgstr ""
 "      --list-file-formats               사용 가능한 파일 형식을 나열합니다.\n"
 "      --monitor-stream=INDEX            색인 INDEX를 사용하여 싱크 입력에서 "
 "기록합니다.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:793
 msgid "Play back encoded audio files on a PulseAudio sound server."
@@ -1992,7 +3030,11 @@ msgstr ""
 "libpulse %s로 컴파일됨\n"
 "libpulse %s와 링크됨\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "잘못된 클라이언트 이름 '%s'"
@@ -2063,7 +3105,11 @@ msgid ""
 "specification from file."
 msgstr "경고: 지정된 샘플 사양은 파일에서의 사양을 덮어쓰기하게 됩니다."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "파일에서 샘플 사양 지정에 실패했습니다."
 
@@ -2097,7 +3143,11 @@ msgstr "재생"
 msgid "Failed to set media name."
 msgstr "미디어 이름 설정에 실패했습니다."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() 실패."
 
@@ -2105,11 +3155,19 @@ msgstr "pa_mainloop_new() 실패."
 msgid "io_new() failed."
 msgstr "io_new() 실패."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() 실패."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() 실패."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() 실패: %s"
@@ -2118,6 +3176,23 @@ msgstr "pa_context_connect() 실패: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() 실패."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() 실패."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "이름 [인수 ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "이름|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() 실패."
@@ -2133,6 +3208,7 @@ msgstr "이름|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "이름"
 
@@ -2144,7 +3220,11 @@ msgstr "이름|#N 볼륨"
 msgid "#N VOLUME"
 msgstr "#N 볼륨"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "이름|#N 1|0"
 
@@ -2180,7 +3260,11 @@ msgstr "경로이름"
 msgid "FILENAME SINK|#N"
 msgstr "파일 이름 싱크|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N 싱크|소스"
 
@@ -2188,6 +3272,17 @@ msgstr "#N 싱크|소스"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "카드 프로파일"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "이름|#N 포트"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "카드 프로파일"
@@ -2197,6 +3292,7 @@ msgid "NAME|#N PORT"
 msgstr "이름|#N 포트"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "카드-이름|카드-#N 포트 오프셋"
 
@@ -2211,11 +3307,19 @@ msgstr "숫자 레벨"
 #: src/utils/pacmd.c:79
 msgid "FRAMES"
 msgstr "프레임"
+<<<<<<< HEAD
+
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr "수신인 메시지 [ 메시지_매개변수]"
+
+=======
 
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "수신인 메시지 [ 메시지_매개변수]"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:82
 #, c-format
 msgid ""
@@ -2278,40 +3382,69 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "통계 검색 실패: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "현재 사용 중: %u 블록 포함 되어 있는 %s bytes 총계.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] "전체 수명 기간 동안 할당: %u 블록 포함 되어 있는 %s bytes 총계.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "샘플 캐쉬 크기: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "서버 정보 획득 실패: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2328,7 +3461,11 @@ msgstr ""
 "클라이언트 개요: %u\n"
 "타일 크기: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2351,6 +3488,74 @@ msgstr ""
 "기본 소스: %s\n"
 "쿠키: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "가용성을 알 수 없음"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "사용 가능"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "사용할 수 없음"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "라인 입력"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mic"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "핸드셋"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "이어폰"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "텔레비전"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "블루투스"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "네트워크"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "아날로그"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "가용성을 알 수 없음"
@@ -2417,11 +3622,16 @@ msgstr "아날로그"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "싱크 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2460,37 +3670,66 @@ msgstr ""
 "\t속성:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\t포트:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (유형: %s, 순위: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", 가용성 그룹: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", 가용성 그룹: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\t활성 포트: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\t형식:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "소스 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2529,6 +3768,17 @@ msgstr ""
 "\t속성:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "해당 없음"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2538,11 +3788,16 @@ msgid "n/a"
 msgstr "해당 없음"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "모듈 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2559,12 +3814,20 @@ msgstr ""
 "\t속성:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "클라이언트 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2579,12 +3842,20 @@ msgstr ""
 "\t속성:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "카드 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2601,29 +3872,49 @@ msgstr ""
 "\t속성:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\t프로파일:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\t활성 프로파일: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2632,17 +3923,29 @@ msgstr ""
 "\t\t\t속성:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\t프로파일 부분: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "싱크 입력 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2682,12 +3985,20 @@ msgstr ""
 "\t속성:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "소스 출력 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2726,12 +4037,20 @@ msgstr ""
 "\t속성:\n"
 "\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "샘플 정보를 가져올 수 없습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2761,21 +4080,50 @@ msgstr ""
 "\t속성:\n"
 "\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "오류: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "메시지 보내기 실패: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr "목록-처리자 메시지에 실패하였습니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr "목록-처리자 메시지 응답은 정확하게 구문 분석 할 수 없습니다"
+
+#: src/utils/pactl.c:951
+#, fuzzy
+msgid "list-handlers message response is not a JSON array"
+msgstr "목록-처리자 메시지 응답은 정확하게 구문 분석 할 수 없습니다"
+
+#: src/utils/pactl.c:962
+#, fuzzy, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr "목록-처리자 메시지 응답은 정확하게 구문 분석 할 수 없습니다"
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr "list-handlers 메시지 응답을 올바르게 구문 분석 할 수 없습니다"
@@ -2790,11 +4138,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr "항목-처리자 메시지 응답 배열 요소 %d는 JSON 객체가 아닙니다"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "모듈 비적재에 실패했습니다: 모듈 %s 불러오기 실패"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2806,11 +4159,74 @@ msgstr[0] ""
 "볼률 설정에 실패하였습니다: %d 채널을 위한 볼률 설정을 시도합니다, 그렇지만 "
 "지원하는 채널 = %d 합니다\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "샘플 업로드 실패: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "파일의 조기 종료"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "새로운"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "변경"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "제거"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "알 수 없음"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "싱크"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "소스"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "싱크-입력"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "소스-출력"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "모듈"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "클라이언트"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "샘플-캐쉬"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "서버"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "카드"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "파일의 조기 종료"
@@ -2868,10 +4284,78 @@ msgid "card"
 msgstr "카드"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "이벤트 '%s'는 %s #%u 상에 있습니다.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT를 받았습니다. 종료합니다."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "잘못된 볼륨 사양"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "볼륨이 허용 범위를 벗어납니다.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "볼륨 사양의 수가 잘못되었습니다.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "볼륨 사양이 일치하지 않습니다.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[옵션]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[유형]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "파일이름 [NAME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "이름 [싱크]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "이름|#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [볼륨 ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "이름|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N 포맷"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT를 받았습니다. 종료합니다."
@@ -2937,6 +4421,7 @@ msgid "#N FORMATS"
 msgstr "#N 포맷"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2947,15 +4432,22 @@ msgstr ""
 "특별한 이름 @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@은\n"
 "기본싱크, 소스 및 모니터를 지정하는데 사용 할 수 있습니다.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -n, --client-name=NAME                How to call this client on the "
@@ -2965,12 +4457,19 @@ msgstr ""
 "  -h, --help 도움말 표시\n"
 " --version 버전 표시\n"
 "\n"
+<<<<<<< HEAD
+" -s, --server=SERVER 연결할 서버 이름\n"
+" -n, --client-name=NAME 서버에서 클라이언트 호출 방법\n"
+
+#: src/utils/pactl.c:1909
+=======
 "  -f, --format=FORMAT                   출력 형식. \"normal\" 또는 \"json\" "
 "중의 하나\n"
 " -s, --server=SERVER 연결할 서버 이름\n"
 " -n, --client-name=NAME 서버에서 클라이언트 호출 방법\n"
 
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2981,16 +4480,59 @@ msgstr ""
 "libpulse %s로 컴파일 됨\n"
 "libpulse %s와 링크됨\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "잘못된 형식 값 '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "아무것도 지정하지 않거나 다움 중 하나을 지정합니다: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "적재 할 샘플 파일을 지정하십시오"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "사운드 파일을 열 수 없습니다."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "경고: 파일에서 샘플 사양을 지정할 수 없습니다."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "재생할 샘플 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "제거할 샘플 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "싱크 입력 인덱스와 싱크를 지정해야 합니다"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "소스 출력 인덱스와 소스를 지정해야 합니다"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "모듈 이름과 인수를 지정해야 합니다."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "모듈 인덱스 또는 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "적재 할 샘플 파일을 지정하십시오"
@@ -3028,20 +4570,306 @@ msgid "You have to specify a module index or name"
 msgstr "모듈 인덱스 또는 이름을 지정해야 합니다"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "하나 이상의 싱크를 지정할 수 없습니다. 부울 값을 지정해야 합니다."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "일시 중지 사양이 잘못되었습니다."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "일시 중지 사양이 잘못되었습니다."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "하나 이상의 소스를 지정할 수 없습니다. 부울 값을 지정해야 합니다."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "카드 이름/인덱스와 프로파일 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "싱크 이름/인덱스와 포트 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "모듈 인덱스 또는 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "소스 이름/인덱스와 포트 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "모듈 인덱스 또는 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "모듈 인덱스 또는 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "싱크 이름/인덱스와 볼륨을 지정해야 합니다"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "모듈 인덱스 또는 이름을 지정해야 합니다"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "소스 이름/인덱스와 볼륨을 지정해야 합니다"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "싱크 입력 인덱스와 볼륨을 지정해야 합니다"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "잘못된 싱크 입력 인덱스"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "소스 출력 인덱스와 볼륨을 지정해야 합니다"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "잘못된 소스 출력 인덱스"
+
+#: src/utils/pactl.c:2274
+msgid ""
+"You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
+msgstr "싱크 이름/인덱스와 무음 부울을 지정해야 합니다"
+
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "잘못된 무음 사양"
+
+#: src/utils/pactl.c:2299
+msgid ""
+"You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
+msgstr "소스 이름/인덱스와 무음 부울을 지정해야 합니다 (0, 1, 또는 '토글')"
+
+#: src/utils/pactl.c:2314
+msgid ""
+"You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
+msgstr "싱크 입력 인덱스와 무음 부울을 지정해야 합니다. (0, 1, or '토글')"
+
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "잘못된 싱크 입력 인덱스 사양"
+
+#: src/utils/pactl.c:2332
+msgid ""
+"You have to specify a source output index and a mute action (0, 1, or "
+"'toggle')"
+msgstr "소스 출력 인덱스와 무음 부울을 지정해야 합니다. (0, 1, or '토글')"
+
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "잘못된 소스 출력 인덱스 사양"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "최소한 객체 경로와 메시지 이름을 지정해야만 합니다"
+
+#: src/utils/pactl.c:2360
+msgid ""
+"Excess arguments given, they will be ignored. Note that all message "
+"parameters must be given as a single string."
+msgstr ""
+"초과 인수가 주어지면, 이들은 무시될 것입니다. 모든 메시지 변수는 단일 문자열"
+"로 주어져야 합니다."
+
+#: src/utils/pactl.c:2370
+msgid ""
+"You have to specify a sink index and a semicolon-separated list of supported "
+"formats"
+msgstr ""
+"싱크 인덱스 및 지원하는 형식의 쌍반점(;)으로 분리된 목록을 지정해야 합니다"
+
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "카드 이름/인덱스, 포트 이름 및 지연 오프셋을 지정해야 합니다"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "지연 오프셋을 분석할 수 없습니다"
+
+#: src/utils/pactl.c:2401
+msgid "No valid command specified."
+msgstr "유효한 명령이 지정되어 있지 않습니다."
+
+#: src/utils/pasuspender.c:79
+#, c-format
+msgid "fork(): %s\n"
+msgstr "fork(): %s\n"
+
+#: src/utils/pasuspender.c:92
+#, c-format
+msgid "execvp(): %s\n"
+msgstr "execvp(): %s\n"
+
+#: src/utils/pasuspender.c:111
+#, c-format
+msgid "Failure to resume: %s\n"
+msgstr "다시 시작하기 실패: %s\n"
+
+#: src/utils/pasuspender.c:145
+#, c-format
+msgid "Failure to suspend: %s\n"
+msgstr "중지 실패: %s\n"
+
+#: src/utils/pasuspender.c:170
+#, c-format
+msgid "WARNING: Sound server is not local, not suspending.\n"
+msgstr "경고: 사운드 서버가 로컬에 있지 않으며 정지하지 않습니다.\n"
+
+#: src/utils/pasuspender.c:183
+#, c-format
+msgid "Connection failure: %s\n"
+msgstr "연결 실패: %s\n"
+
+#: src/utils/pasuspender.c:201
+#, c-format
+msgid "Got SIGINT, exiting.\n"
+msgstr "SIGINT 받음, 종료 중.\n"
+
+#: src/utils/pasuspender.c:219
+#, c-format
+msgid "WARNING: Child process terminated by signal %u\n"
+msgstr "경고: 자식 프로세스가 시그널 %u에 의해 종료되었습니다.\n"
+
+#: src/utils/pasuspender.c:228
+#, c-format
+msgid ""
+"%s [options] -- PROGRAM [ARGUMENTS ...]\n"
+"\n"
+"Temporarily suspend PulseAudio while PROGRAM runs.\n"
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"  -s, --server=SERVER                   The name of the server to connect "
+"to\n"
+"\n"
+msgstr ""
+"%s [옵션] -- 프로그램 -[ 인수 ...]\n"
+"\n"
+"프로그램이 동작 할 때에 일시적으로 PulseAudio를 중지합니다.\n"
+"\n"
+" -h, --help 도움말 표시\n"
+" --version 버전 표시\n"
+" -s, --server=SERVER 연결할 서버 이름\n"
+"\n"
+
+#: src/utils/pasuspender.c:267
+#, c-format
+msgid ""
+"pasuspender %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
+"pasuspender %s\n"
+"libpulse %s로 컴파일\n"
+"libpulse %s로 연결\n"
+
+#: src/utils/pasuspender.c:296
+#, c-format
+msgid "pa_mainloop_new() failed.\n"
+msgstr "pa_mainloop_new() 실패.\n"
+
+#: src/utils/pasuspender.c:309
+#, c-format
+msgid "pa_context_new() failed.\n"
+msgstr "pa_context_new() 실패.\n"
+
+#: src/utils/pasuspender.c:321
+#, c-format
+msgid "pa_mainloop_run() failed.\n"
+msgstr "pa_mainloop_run() 실패.\n"
+
+#: src/utils/pax11publish.c:58
+#, 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 sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
+"\n"
+" -d    X11 디스플레이에 연결된 최신 PulseAudio 데이터 표시 (기본값)\n"
+" -e    X11 디스플레이에 로컬 PulseAudio 데이터를 내보내기\n"
+" -i    X11 디스플레이에서 로컬 환경 변수 및 쿠키 파일에 PulseAudio 데이터 가"
+"져오기.\n"
+" -r    X11 디스플레이에서 PulseAudio 데이터 삭제\n"
+
+#: src/utils/pax11publish.c:91
+#, c-format
+msgid "Failed to parse command line.\n"
+msgstr "명령행 분석 실패\n"
+
+#: src/utils/pax11publish.c:110
+#, c-format
+msgid "Server: %s\n"
+msgstr "서버: %s\n"
+
+#: src/utils/pax11publish.c:112
+#, c-format
+msgid "Source: %s\n"
+msgstr "소스: %s\n"
+
+#: src/utils/pax11publish.c:114
+#, c-format
+msgid "Sink: %s\n"
+msgstr "싱크: %s\n"
+
+#: src/utils/pax11publish.c:116
+#, c-format
+msgid "Cookie: %s\n"
+msgstr "쿠키: %s\n"
+
+#: src/utils/pax11publish.c:134
+#, c-format
+msgid "Failed to parse cookie data\n"
+msgstr "쿠키 데이터 분석 실패\n"
+
+#: src/utils/pax11publish.c:139
+#, c-format
+msgid "Failed to save cookie data\n"
+msgstr "쿠키 데이터 저장 실패\n"
+
+#: src/utils/pax11publish.c:168
+#, c-format
+msgid "Failed to get FQDN.\n"
+msgstr "FQDN을 가져올 수 없습니다.\n"
+
+#: src/utils/pax11publish.c:188
+#, c-format
+msgid "Failed to load cookie data\n"
+msgstr "쿠키 데이터 읽기 실패\n"
+
+#: src/utils/pax11publish.c:206
+#, c-format
+msgid "Not yet implemented.\n"
+msgstr "아직 구현되지 않았습니다.\n"
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "카드 이름/인덱스와 프로파일 이름을 지정해야 합니다"
@@ -3322,6 +5150,7 @@ msgstr "아직 구현되지 않았습니다.\n"
 #~ msgstr ""
 #~ "--log-level은 로그 수준 논의가 예상됩니다 (0..4 숫자 범위 내의 수 또는 디"
 #~ "버그중의 하나, 정보, 알림, 경고, 오류)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #~ msgid "Got signal %s."
 #~ msgstr "시그널 %s를 받았습니다."
diff --git a/po/lt.po b/po/lt.po
index e873c28b5..2e3d78fdc 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,11 +8,18 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2019-09-01 16:15+0300\n"
+"Last-Translator: Moo\n"
+"Language-Team: \n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2023-02-21 23:21+0000\n"
 "Last-Translator: mooo <hazap@hotmail.com>\n"
 "Language-Team: Lithuanian <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/lt/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -614,7 +621,11 @@ msgid "Line In"
 msgstr "Įvadinė linija"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofonas"
 
@@ -635,12 +646,20 @@ msgid "Internal Microphone"
 msgstr "Vidinis mikrofonas"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radijas"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Vaizdas"
 
@@ -677,12 +696,20 @@ msgid "No Bass Boost"
 msgstr "Be žemų tonų pastiprinimo"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Garsiakalbis"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Ausinės"
 
@@ -703,8 +730,14 @@ msgid "Analog Output"
 msgstr "Analoginė išvestis"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Ausinės"
+=======
 msgid "Headphones 2"
 msgstr "Ausinės 2"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2809
 msgid "Headphones Mono Output"
@@ -751,8 +784,14 @@ msgid "Chat Output"
 msgstr "Pokalbio išvestis"
 
 #: src/modules/alsa/alsa-mixer.c:2821
+<<<<<<< HEAD
+#, fuzzy
+msgid "Chat Input"
+msgstr "Pokalbio išvestis"
+=======
 msgid "Chat Input"
 msgstr "Pokalbio įvestis"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2822
 #, fuzzy
@@ -793,7 +832,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Ausinės su mikrofonu"
 
@@ -907,7 +950,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Išjungta"
 
@@ -921,7 +968,11 @@ msgstr "%s išvestis"
 msgid "%s Input"
 msgstr "%s įvestis"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -938,7 +989,11 @@ msgstr ""
 "Mes buvome iškviesti su nustatytu POLLOUT -- vis dėlto, vėlesnis "
 "snd_pcm_avail() grąžino 0 ar kitą reikšmę < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1052,6 +1107,67 @@ msgstr[2] ""
 "Greičiausiai, tai yra klaida ALSA \"%s\" tvarkyklėje. Prašome apie šią "
 "klaidą pranešti ALSA kūrėjams."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth įvestis"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth išvestis"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Laisvų rankų įranga"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Ausinė"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portatyvi sistema"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Automobilis"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefonas"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Aukštos kokybės atkūrimas (A2DP rinktuvas)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Aukštos kokybės paėmimas (A2DP šaltinis)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Ausinių su mikrofonu pagrindinis įtaisas (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Ausinių su mikrofonu garso tinklų sietuvas (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Ausinių su mikrofonu pagrindinis įtaisas (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1111,6 +1227,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Ausinių su mikrofonu pagrindinis įtaisas (HSP/HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Ausinių su mikrofonu garso tinklų sietuvas (HSP/HFP)"
@@ -1217,11 +1334,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Sinchroninis tuščiasis rinktuvas"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Nulinė išvestis"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Nulinė išvestis"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Nepavyko nustatyti formato: neteisinga formato eilutė %s"
@@ -1244,14 +1369,24 @@ msgstr "Garsas ties @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunelis, skirtas %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunelis į %s/%s"
@@ -1283,7 +1418,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Nežinomas įrenginio modelis"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "RAOP standartinis profilis"
 
@@ -1602,11 +1741,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Neteisinga žurnalo paskirtis."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Įtaisytas garsas"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Įtaisytas garsas"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modemas"
 
@@ -1881,7 +2028,11 @@ msgstr "Nepavyko nustatytį monitorinį srautą: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() nepavyko %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Sujungimo nesėkmė: %s"
@@ -2088,7 +2239,11 @@ msgstr ""
 "Sukompiliuota su libpulse %s\n"
 "Susieta su libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Neteisingas kliento pavadinimas \"%s\""
@@ -2161,7 +2316,11 @@ msgstr ""
 "Įspėjimas: nurodyta ėminio specifikacija bus perrašyta specifikacija iš "
 "failo."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Nepavyko iš failo nustatyti ėminio specifikaciją."
 
@@ -2196,7 +2355,11 @@ msgstr "atkūrimas"
 msgid "Failed to set media name."
 msgstr "Nepavyko nustatyti laikmenos pavadinimo."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() nepavyko."
 
@@ -2204,11 +2367,19 @@ msgstr "pa_mainloop_new() nepavyko."
 msgid "io_new() failed."
 msgstr "io_new() nepavyko."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() nepavyko."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() nepavyko."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() nepavyko: %s"
@@ -2217,6 +2388,23 @@ msgstr "pa_context_connect() nepavyko: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() nepavyko."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() nepavyko."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "PAVADINIMAS [ARGUMENTAI ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "PAVADINIMAS|#NUMERIS"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() nepavyko."
@@ -2232,6 +2420,7 @@ msgstr "PAVADINIMAS|#NUMERIS"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "PAVADINIMAS"
 
@@ -2243,7 +2432,11 @@ msgstr "PAVADINIMAS|#NUMERIS GARSIS"
 msgid "#N VOLUME"
 msgstr "#NUMERIS GARSIS"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "PAVADINIMAS|#NUMERIS 1|0"
 
@@ -2279,7 +2472,11 @@ msgstr "KELIAS"
 msgid "FILENAME SINK|#N"
 msgstr "FAILO_PAVADINIMAS RINKTUVAS|#NUMERIS"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#NUMERIS RINKTUVAS|ŠALTINIS"
 
@@ -2287,6 +2484,17 @@ msgstr "#NUMERIS RINKTUVAS|ŠALTINIS"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PLOKŠTĖS PROFILIS"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "PAVADINIMAS|#NUMERIS PRIEVADAS"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PLOKŠTĖS PROFILIS"
@@ -2296,6 +2504,7 @@ msgid "NAME|#N PORT"
 msgstr "PAVADINIMAS|#NUMERIS PRIEVADAS"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "PLOKŠTĖS-PAVADINIMAS|PLOKŠTĖS-#NUMERIS PRIEVADAS POSLINKIS"
 
@@ -2311,7 +2520,11 @@ msgstr "SKAITINIS-LYGIS"
 msgid "FRAMES"
 msgstr "KADRAI"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2376,12 +2589,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Nepavyko gauti statistikos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2389,7 +2610,11 @@ msgstr[0] "Šiuo metu naudojama: %u blokas, kuriame iš viso yra %s baitų.\n"
 msgstr[1] "Šiuo metu naudojama: %u blokai, kuriuose iš viso yra %s baitų.\n"
 msgstr[2] "Šiuo metu naudojama: %u blokų, kuriuose iš viso yra %s baitų.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2404,22 +2629,38 @@ msgstr[2] ""
 "Paskirstyta per visą gyvavimo trukmę: %u blokų, kuriuose iš viso yra %s "
 "baitų.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Ėminių podėlio dydis: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Nepavyko gauti serverio informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2436,7 +2677,11 @@ msgstr ""
 "Kliento indeksas: %u\n"
 "Plytelės dydis: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2459,6 +2704,21 @@ msgstr ""
 "Numatytasis šaltinis: %s\n"
 "Slapukas: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2472,28 +2732,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "nežinoma"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Įvadinė linija"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Ausinės su mikrofonu"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2515,26 +2815,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Bluetooth įvestis"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Analoginė mono"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Nepavyko gauti rinktuvo informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2573,38 +2891,67 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPrievadai:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 "\t\t%s: %s (rinktuvų: %u, šaltinių: %u, pirmenybė: %u, prieinama: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktyvus prievadas: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormatai:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Nepavyko gauti šaltinio informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2643,6 +2990,17 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "nėra"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2652,11 +3010,16 @@ msgid "n/a"
 msgstr "nėra"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Nepavyko gauti modulio informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2673,12 +3036,20 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Nepavyko gauti kliento informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2693,12 +3064,20 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Nepavyko gauti plokštės informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2715,29 +3094,49 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfiliai:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 "\t\t%s: %s (rinktuvų: %u, šaltinių: %u, pirmenybė: %u, prieinama: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktyvus profilis: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2746,17 +3145,29 @@ msgstr ""
 "\t\t\tSavybės:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tProfilio(-ių) dalis: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Nepavyko gauti rinktuvo įvesties informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2795,12 +3206,20 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Nepavyko gauti šaltinio išvesties informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2839,12 +3258,20 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Nepavyko gauti ėminio informacijos: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2873,21 +3300,44 @@ msgstr ""
 "\tSavybės:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Triktis: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() nepavyko: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2897,16 +3347,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Nepavyko iškelti modulio: Modulis %s nėra įkeltas"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2924,11 +3383,74 @@ msgstr[2] ""
 "Nepavyko nustatyti garsio: Jūs bandėte nustatyti garsius %d kanalų, tuo "
 "tarpu palaikomų kanalų yra = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Nepavyko įkelti ėminio: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Priešlaikinė failo pabaiga"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nauja"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "pakeisti"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "šalinti"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "nežinoma"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "rinktuvas"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "šaltinis"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "rinktuvo-įvestis"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "šaltinio-išvestis"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modulis"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klientas"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "ėminių-podėlis"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "serveris"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "plokštė"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Priešlaikinė failo pabaiga"
@@ -2986,10 +3508,78 @@ msgid "card"
 msgstr "plokštė"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Įvykis \"%s\" ties %s Nr.%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Gautas SIGINT, išeinama."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Neteisinga garsio specifikacija"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Garsis už leidžiamų ribų diapazono.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Neteisingas garsio specifikacijų skaičius.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Nesuderinama garsio specifikacija.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[parametrai]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPAS]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "FAILO_PAVADINIMAS [PAVADINIMAS]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "PAVADINIMAS [RINKTUVAS]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "PAVADINIMAS|#NUMERIS GARSIS [GARSIS ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#NUMERIS GARSIS [GARSIS ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "PAVADINIMAS|#NUMERIS 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#NUMERIS 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#NUMERIS FORMATAI"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Gautas SIGINT, išeinama."
@@ -3055,6 +3645,7 @@ msgid "#N FORMATS"
 msgstr "#NUMERIS FORMATAI"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3066,8 +3657,13 @@ msgstr ""
 "gali būti naudojami, norint nurodyti numatytąjį rinktuvą, šaltinį ir "
 "monitorių.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3089,7 +3685,11 @@ msgstr ""
 "  -n, --client-name=NAME                Kaip vadinti šį, serveryje esantį, "
 "klientą\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3100,16 +3700,59 @@ msgstr ""
 "Sukompiliuota su libpulse %s\n"
 "Susieta su libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Neteisingas srauto pavadinimas \"%s\""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Nieko nenurodykite arba nurodykite vieną iš: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Prašome nurodyti ėminio failą, kurį įkelti"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Nepavyko atverti garso failo."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Įspėjimas: Nepavyko iš failo nustatyti ėminio specifikacijos."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Jūs turite nurodyti ėminio, kurį groti, pavadinimą"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Jūs turite nurodyti ėminio, kurį šalinti, pavadinimą"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Jūs turite nurodyti rinktuvo įvesties indeksą ir rinktuvą"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Jūs turite nurodyti šaltinio išvesties indeksą ir šaltinį"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Jūs turite nurodyti modulio pavadinimą ir argumentus."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Jūs turite nurodyti modulio indeksą ar pavadinimą"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Prašome nurodyti ėminio failą, kurį įkelti"
@@ -3147,17 +3790,26 @@ msgid "You have to specify a module index or name"
 msgstr "Jūs turite nurodyti modulio indeksą ar pavadinimą"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Jūs negalite nurodyti daugiau kaip vieną rinktuvą. Turite nurodyti loginę "
 "reikšmę."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Neteisinga pristabdymo specifikacija."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Neteisinga pristabdymo specifikacija."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3165,6 +3817,29 @@ msgstr ""
 "Jūs negalite nurodyti daugiau kaip vieną šaltinį. Turite nurodyti loginę "
 "reikšmę."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Jūs turite nurodyti plokštės pavadinimą/indeksą ir profilio pavadinimą"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Jūs turite nurodyti rinktuvo pavadinimą/indeksą ir prievado pavadinimą"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Jūs turite nurodyti rinktuvo pavadinimą"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Jūs turite nurodyti šaltinio pavadinimą/indeksą ir prievado pavadinimą"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Jūs turite nurodyti šaltinio pavadinimą"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Jūs turite nurodyti plokštės pavadinimą/indeksą ir profilio pavadinimą"
@@ -3186,19 +3861,51 @@ msgid "You have to specify a source name"
 msgstr "Jūs turite nurodyti šaltinio pavadinimą"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Jūs turite nurodyti rinktuvo pavadinimą"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Jūs turite nurodyti rinktuvo pavadinimą/indeksą ir garsį"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Jūs turite nurodyti rinktuvo pavadinimą/indeksą ir garsį"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Jūs turite nurodyti šaltinio pavadinimą"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Jūs turite nurodyti šaltinio pavadinimą/indeksą ir garsį"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Jūs turite nurodyti rinktuvo įvesties indeksą ir garsį"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Neteisingas rinktuvo įvesties indeksas"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Jūs turite nurodyti šaltinio išvesties indeksą ir garsį"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Neteisingas šaltinio išvesties indeksas"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Jūs turite nurodyti šaltinio pavadinimą/indeksą ir garsį"
@@ -3220,36 +3927,58 @@ msgid "Invalid source output index"
 msgstr "Neteisingas šaltinio išvesties indeksas"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Jūs turite nurodyti rinktuvo pavadinimą/indeksą ir nutildymo veiksmą (0, 1 "
 "arba \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Neteisinga nutildymo specifikacija"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Neteisinga nutildymo specifikacija"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Jūs turite nurodyti šaltinio pavadinimą/indeksą ir nutildymo veiksmą (0, 1 "
 "arba \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Jūs turite nurodyti rinktuvo įvesties indeksą ir nutildymo veiksmą (0, 1 "
 "arba \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Neteisinga rinktuvo įvesties indekso specifikacija"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Neteisinga rinktuvo įvesties indekso specifikacija"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3257,22 +3986,38 @@ msgstr ""
 "Jūs turite nurodyti šaltinio išvesties indeksą ir nutildymo veiksmą (0, 1 "
 "arba \"toggle\")"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Neteisinga šaltinio išvesties indekso specifikacija"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Neteisinga šaltinio išvesties indekso specifikacija"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Jūs turite nurodyti rinktuvo pavadinimą/indeksą ir prievado pavadinimą"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3280,17 +4025,29 @@ msgstr ""
 "Jūs turite nurodyti rinktuvo indeksą ir kabliataškiais atskirtų palaikomų "
 "formatų sąrašą"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Jūs turite nurodyti plokštės pavadinimą/indeksą, prievado pavadinimą ir "
 "delsos poslinkį"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Nepavyko analizuoti delsos poslinkio"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Nepavyko analizuoti delsos poslinkio"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Nenurodyta taisyklinga komanda."
 
diff --git a/po/ml.po b/po/ml.po
index 643bc006d..e98431150 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,7 +6,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.ml\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:41+0000\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -166,10 +170,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail-നു് ബൂളിയന്‍ ആര്‍ഗ്യുമെന്റ് ആവശ്യമുണ്ടു്"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level-നു് ലോഗ് ലവല്‍ ആര്‍ഗ്യുമെന്റ് ആവശ്യമുണ്ടു് (ഒന്നുകില്‍ 0..4 വരെയുള്ള ന്യൂമറിക് പരിധി "
 "അല്ലെങ്കില്‍ debug, info, notice, warn, error എന്നിവയില്‍ ഒന്നു്)."
@@ -588,7 +598,11 @@ msgid "Line In"
 msgstr "അനലോഗ് ലൈന്‍-ഇന്‍"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "മൈക്രോഫോണ്‍"
 
@@ -611,12 +625,20 @@ msgid "Internal Microphone"
 msgstr "ഇന്റേണല്‍ മൈക്രോഫോണ്‍"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "റേഡിയോ"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "വീഡിയോ"
 
@@ -655,12 +677,20 @@ msgid "No Bass Boost"
 msgstr "ബൂസ്റ്റ് ലഭ്യമല്ല"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "അനലോഗ് ഹെഡ്ഫോണുകള്‍"
 
@@ -780,6 +810,79 @@ msgstr "മോണോ"
 #: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
 msgid "Stereo"
 msgstr "സ്റ്റീരിയോ"
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+#, fuzzy
+msgid "Speakerphone"
+msgstr "അനലോഗ് സ്റ്റീരിയോ"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "അനലോഗ് സറൌണ്ട് 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "അനലോഗ് സറൌണ്ട് 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "അനലോഗ് സറൌണ്ട് 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "അനലോഗ് സറൌണ്ട് 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "അനലോഗ് സറൌണ്ട് 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "അനലോഗ് സറൌണ്ട് 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "അനലോഗ് സറൌണ്ട് 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "അനലോഗ് സറൌണ്ട് 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "അനലോഗ് സറൌണ്ട് 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "അനലോഗ് സറൌണ്ട് 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "അനലോഗ് സറൌണ്ട് 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "ഡിജിറ്റല്‍ സ്റ്റീരിയോ (IEC958) "
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "ഡിജിറ്റല്‍ സറൌണ്ട് 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "ഡിജിറ്റല്‍ സറൌണ്ട് 5.1 (IEC958/AC3)"
+
+=======
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
@@ -851,6 +954,7 @@ msgstr "ഡിജിറ്റല്‍ സറൌണ്ട് 4.0 (IEC958/AC3)"
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "ഡിജിറ്റല്‍ സറൌണ്ട് 5.1 (IEC958/AC3)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4594
 #, fuzzy
 msgid "Digital Surround 5.1 (IEC958/DTS)"
@@ -899,7 +1003,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "ഓഫ്"
 
@@ -913,7 +1021,11 @@ msgstr "നള്‍ ഔട്ട്പുട്ട്"
 msgid "%s Input"
 msgstr "ഇന്‍പുട്ട്"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -929,7 +1041,11 @@ msgstr ""
 "POLLOUT സെറ്റ് വഴി നമ്മെ അറിയിച്ചിരിക്കുന്നു -- പക്ഷേ, snd_pcm_avail() ലഭ്യമാക്കിയതു് 0 "
 "അല്ലെങ്കില്‍ മറ്റൊരു മൂല്ല്യം < min_avail ആണു്."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -963,6 +1079,66 @@ msgstr[0] ""
 msgstr[1] ""
 "snd_pcm_avail() നല്‍കിയ മൂല്ല്യം വളരെ വലുതാണു്: %lu ബൈറ്റുകള്‍ (%lu ms).\n"
 "ഇതു് ALSA ഡ്രൈവര്‍ '%s'-ലുള്ള ഒരു ബഗാവാം. ദയവായി ഈ പ്രശ്നം ALSA ഡവലപ്പര്‍സിനെ അറിയിക്കുക."
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-util.c:1249
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() നല്‍കിയ മൂല്ല്യം വളരെ വലുതാണു്: %li ബൈറ്റുകള്‍ (%s%lu ms).\n"
+"ഇതു് ALSA ഡ്രൈവര്‍ '%s'-ലുള്ള ഒരു ബഗാവാം. ദയവായി ഈ പ്രശ്നം ALSA ഡവലപ്പര്‍സിനെ അറിയിക്കുക."
+msgstr[1] ""
+"snd_pcm_delay() നല്‍കിയ മൂല്ല്യം വളരെ വലുതാണു്: %li ബൈറ്റുകള്‍ (%s%lu ms).\n"
+"ഇതു് ALSA ഡ്രൈവര്‍ '%s'-ലുള്ള ഒരു ബഗാവാം. ദയവായി ഈ പ്രശ്നം ALSA ഡവലപ്പര്‍സിനെ അറിയിക്കുക."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, fuzzy, 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 ""
+"snd_pcm_avail() നല്‍കിയ മൂല്ല്യം വളരെ വലുതാണു്: %lu ബൈറ്റുകള്‍ (%lu ms).\n"
+"ഇതു് ALSA ഡ്രൈവര്‍ '%s'-ലുള്ള ഒരു ബഗാവാം. ദയവായി ഈ പ്രശ്നം ALSA ഡവലപ്പര്‍സിനെ അറിയിക്കുക."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() നല്‍കിയ മൂല്ല്യം വളരെ വലുതാണു്: %lu ബൈറ്റുകള്‍(%lu ms).\n"
+"ഇതു് ALSA ഡ്രൈവര്‍ '%s'-ലുള്ള ഒരു ബഗാവാം. ദയവായി ഈ പ്രശ്നം ALSA ഡവലപ്പര്‍സിനെ അറിയിക്കുക."
+msgstr[1] ""
+"snd_pcm_mmap_begin() നല്‍കിയ മൂല്ല്യം വളരെ വലുതാണു്: %lu ബൈറ്റുകള്‍(%lu ms).\n"
+"ഇതു് ALSA ഡ്രൈവര്‍ '%s'-ലുള്ള ഒരു ബഗാവാം. ദയവായി ഈ പ്രശ്നം ALSA ഡവലപ്പര്‍സിനെ അറിയിക്കുക."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 
 #: src/modules/alsa/alsa-util.c:1249
 #, fuzzy, c-format
@@ -1021,19 +1197,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "അനലോഗ് ഔട്ട്പുട്ട്"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "അനലോഗ് ഹെഡ്ഫോണുകള്‍"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1051,15 +1255,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "ഹൈ ഫിഡലിറ്റി പ്ലേബാക്ക് (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "ഹൈ ഫിഡലിറ്റി കാപ്ചര്‍ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1073,6 +1297,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1133,8 +1358,13 @@ msgstr ""
 "plugin name> label=<ladspa plugin label> control=<comma separated list of "
 "input control values>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1170,11 +1400,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "ക്ലോക്കഡ് NULL സിങ്ക്"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "നള്‍ ഔട്ട്പുട്ട്"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "നള്‍ ഔട്ട്പുട്ട്"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "സോഴ്സ് വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
@@ -1197,14 +1435,24 @@ msgstr "@HOSTNAME@-ലുള്ള ഓഡിയോ"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1236,7 +1484,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "അപരിചിതമായ പിശക് കോഡ്"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1435,6 +1687,135 @@ msgstr "മുകളില്‍ മുമ്പില്‍ വലത്തു
 #: src/pulse/channelmap.c:160
 msgid "Top Rear Center"
 msgstr "മുകളില്‍ അവസാനം മദ്ധ്യം"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "മുകളില്‍ അവസാനം ഇടത്തു്"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "മുകളില്‍ അവസാനം വലത്തു്"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(അസാധു)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "സറൌണ്ട് 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "സറൌണ്ട് 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "സറൌണ്ട് 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "സറൌണ്ട് 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "സറൌണ്ട് 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() പരാജയപ്പെട്ടു: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "കുക്കി ഡേറ്റാ പാഴ്സ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "അപരിചിതമായ എക്സ്റ്റെന്‍ഷന്‍ '%s'-നുള്ള സന്ദേശം ലഭിച്ചിരിക്കുന്നു"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "ഇന്‍പുട്ട്"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "നള്‍ ഔട്ട്പുട്ട്"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(അസാധു)"
+
+#: src/pulsecore/core-util.c:1790
+#, 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 ""
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr ""
+
+#: src/pulsecore/core-util.h:97
+#, fuzzy
+msgid "no"
+msgstr "മോണോ"
+
+#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "ഓട്ടോസ്പൌണ്‍ ലോക്ക് ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല."
+
+#: src/pulsecore/log.c:165
+#, fuzzy, c-format
+msgid "Failed to open target file '%s'."
+msgstr "ഓ‍ഡിയോ ഫയല്‍ തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+#: src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: src/pulsecore/log.c:651
+#, fuzzy
+msgid "Invalid log target."
+msgstr "[%s:%u] തെറ്റായ ലോഗ് ടാര്‍ഗറ്റ് '%s'."
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "ഇന്റേര്‍ണല്‍ ഓഡിയോ"
+
+#: src/pulsecore/sink.c:3544
+msgid "Modem"
+msgstr "മോഡം"
+
+=======
 
 #: src/pulse/channelmap.c:161
 msgid "Top Rear Left"
@@ -1563,6 +1944,7 @@ msgstr "ഇന്റേര്‍ണല്‍ ഓഡിയോ"
 msgid "Modem"
 msgstr "മോഡം"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/error.c:38
 msgid "OK"
 msgstr "ശരി"
@@ -1835,7 +2217,11 @@ msgstr "സ്ട്രീം ഡ്രെയിന്‍ ചെയ്യുന
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "കണക്ഷനില്‍ തകരാര്‍: %s"
@@ -2029,7 +2415,11 @@ msgstr ""
 "libpulse %s-നൊപ്പം കംപൈല്‍ ചെയ്തിരിക്കുന്നു\n"
 "libpulse %s-നൊപ്പം ലിങ്ക് ചെയ്തിരിക്കുന്നു\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "തെറ്റായ ക്ലൈന്റ് നാമം '%s'"
@@ -2101,7 +2491,11 @@ msgid ""
 msgstr ""
 "മുന്നറിയിപ്പു്: ഫയലില്‍ നിന്നുള്ള വിവരണം വ്യക്തമാക്കിയിരിക്കുന്ന സാംപിള്‍ വിവരണം മാറ്റിയെഴുതുന്നു."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ഫയലില്‍ നിന്നും സാംപിള്‍ വിവരണം ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
 
@@ -2136,7 +2530,11 @@ msgstr "പ്ലേബാക്ക്"
 msgid "Failed to set media name."
 msgstr "കമാന്‍ഡ് ലൈന്‍ പാഴ്സ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() പരാജയപ്പെട്ടു."
 
@@ -2144,11 +2542,19 @@ msgstr "pa_mainloop_new() പരാജയപ്പെട്ടു."
 msgid "io_new() failed."
 msgstr "io_new() പരാജയപ്പെട്ടു."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() പരാജയപ്പെട്ടു."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() പരാജയപ്പെട്ടു."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() പരാജയപ്പെട്ടു: %s"
@@ -2157,6 +2563,23 @@ msgstr "pa_context_connect() പരാജയപ്പെട്ടു: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() പരാജയപ്പെട്ടു."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() പരാജയപ്പെട്ടു."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() പരാജയപ്പെട്ടു."
@@ -2172,6 +2595,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2183,7 +2607,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2219,7 +2647,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2227,6 +2659,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2236,6 +2679,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2251,7 +2695,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2319,6 +2767,29 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+#, c-format
+msgid "Failed to get statistics: %s"
+msgstr "സ്ഥിതിവിവരക്കണക്കുകള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
+
+#: src/utils/pactl.c:181
+#, fuzzy, c-format
+msgid "Currently in use: %u block containing %s bytes total.\n"
+msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
+msgstr[0] "നിലവില്‍ ഉപയോഗത്തില്‍: %u ബ്ലോക്കുകള്‍, മൊത്തം %s ബൈറ്റുകള്‍ അടങ്ങുന്നു.\n"
+msgstr[1] "നിലവില്‍ ഉപയോഗത്തില്‍: %u ബ്ലോക്കുകള്‍, മൊത്തം %s ബൈറ്റുകള്‍ അടങ്ങുന്നു.\n"
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "കാലാവധിയ്ക്കുള്ളില്‍ അനുവദിക്കുന്നു: %u ബ്ലോക്കുകള്‍, മൊത്തം %s ബൈറ്റുകള്‍ അടങ്ങുന്നു.\n"
+msgstr[1] "കാലാവധിയ്ക്കുള്ളില്‍ അനുവദിക്കുന്നു: %u ബ്ലോക്കുകള്‍, മൊത്തം %s ബൈറ്റുകള്‍ അടങ്ങുന്നു.\n"
+
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:183
 #, c-format
 msgid "Failed to get statistics: %s"
@@ -2340,21 +2811,34 @@ msgstr[0] "കാലാവധിയ്ക്കുള്ളില്‍ അന
 msgstr[1] "കാലാവധിയ്ക്കുള്ളില്‍ അനുവദിക്കുന്നു: %u ബ്ലോക്കുകള്‍, മൊത്തം %s ബൈറ്റുകള്‍ അടങ്ങുന്നു.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "സാംപിള്‍ കാഷ് വ്യപ്തി: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "സര്‍വര്‍ വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2365,7 +2849,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2388,6 +2876,77 @@ msgstr ""
 "Default Source: %s\n"
 "Cookie: %08x\n"
 
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "അപരിചിതമായ കമാന്‍ഡ്"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "അനലോഗ് ലൈന്‍-ഇന്‍"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "അനലോഗ് മോണോ"
+
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2457,11 +3016,16 @@ msgstr "അനലോഗ് മോണോ"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "സിങ്ക് വിവരം ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2500,37 +3064,66 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tപോര്‍ട്ടുകള്‍:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tസജീവമായ പോര്‍ട്ട്: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tപോര്‍ട്ടുകള്‍:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "സോഴ്സ് വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2569,6 +3162,17 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2578,11 +3182,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "ഘടക വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2599,12 +3208,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "ക്ലൈന്റ് വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2619,12 +3236,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "കാര്‍ഡ് വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2641,45 +3266,77 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tപ്രൊഫൈലുകള്‍:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tസജീവമായ പ്രൊഫൈല്‍: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "സിങ്ക് ഇന്‍പുട്ട് വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2717,12 +3374,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "സോഴ്സ് ഔട്ട്പുട്ട് വിവരം ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2760,12 +3425,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "മാതൃകയുടെ വിവരങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2795,16 +3468,61 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "പരാജയം: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+#, fuzzy, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "മാതൃക അപ്ലോഡ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
+
+#: src/utils/pactl.c:1051
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channel, whereas "
+"channel(s) supported = %d\n"
+msgid_plural ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel(s) supported = %d\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2840,10 +3558,62 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "മാതൃക അപ്ലോഡ് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "ഫയല്‍ അനുചിതമായ അവസാനം"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "ഫയല്‍ അനുചിതമായ അവസാനം"
@@ -2893,19 +3663,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "തെറ്റായ സര്‍വര്‍"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT ലഭ്യമായി, പുറത്തു് കടക്കുന്നു."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "തെറ്റായ വോള്യം വിവരണങ്ങള്‍"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT ലഭ്യമായി, പുറത്തു് കടക്കുന്നു."
@@ -2919,15 +3713,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "തെറ്റായ വോള്യം വിവരണങ്ങള്‍"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "തെറ്റായ വോള്യം വിവരണങ്ങള്‍"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2973,6 +3819,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2980,7 +3827,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3002,7 +3853,11 @@ msgstr ""
 "to\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3013,16 +3868,55 @@ msgstr ""
 "libpulse %s-നൊപ്പം കംപൈല്‍ ചെയ്തിരിക്കുന്നു\n"
 "libpulse %s-നൊപ്പം ലിങ്ക് ചെയ്തിരിക്കുന്നു\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "തെറ്റായ സ്ട്രീം നാമം '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "ലഭ്യമാക്കുന്നതിലുള്ള മാതൃകാ ഫയല്‍ ദയവായി വ്യക്തമാക്കുക"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "ശബ്ദ ഫയല്‍ തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "മുന്നറിയിപ്പു്: ഫയലില്‍ നിന്നും മാതൃകയുടെ വിവരണം കണ്ടുപിടിക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "പ്രവര്‍ത്തിപ്പിക്കുവാനുള്ള മാതൃകയുടെ പേരു് നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "നീക്കം ചെയ്യുന്നതിനുള്ള മാതൃകയുടെ പേരു് നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "ഒരു സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സും സിങ്കും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "ഒരു സോഴ്സ് ഔട്ട്പുട്ട് ഇന്‍ഡക്സും സോഴ്സും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "ഒരു മൌഡ്യൂള്‍ നാമവും ആര്‍ഗ്യുമെന്റുകളും നല്‍കേണ്ടതുണ്ടു്."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "ലഭ്യമാക്കുന്നതിലുള്ള മാതൃകാ ഫയല്‍ ദയവായി വ്യക്തമാക്കുക"
@@ -3056,28 +3950,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "ഒരു മൌഡ്യൂള്‍ നാമവും ആര്‍ഗ്യുമെന്റുകളും നല്‍കേണ്ടതുണ്ടു്."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "ഒരു മൌഡ്യൂള്‍ ഇന്‍ഡക്സ് നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "ഒരു സിങ്കില്‍ കൂടുതല്‍ നിങ്ങള്‍ നല്‍കേണ്ടതില്ല. കൂടാതെ, ഒരു ബൂളിയന്‍ മൂല്ല്യവും നിങ്ങള്‍ നല്‍കേണ്ടതാണു്."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "തെറ്റായ മാതൃക വിവരണം"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "ഒരു സോഴ്സില്‍ കൂടുതല്‍ നിങ്ങള്‍ നല്‍കേണ്ടതില്ല. കൂടാതെ, ഒരു ബൂളിയന്‍ മൂല്ല്യവും നിങ്ങള്‍ നല്‍കേണ്ടതാണു്."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "ഒരു കാര്‍ഡ് നാമം/ഇന്‍ഡക്സും പ്രൊഫൈല്‍ നാമവും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "ഒരു സിങ്ക് നാമം/ഇന്‍ഡക്സും പോര്‍ട്ട് നാമവും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "ഒരു കാര്‍ഡ് നാമം/ഇന്‍ഡക്സും പ്രൊഫൈല്‍ നാമവും നല്‍കേണ്ടതുണ്ടു്"
@@ -3087,33 +4005,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "ഒരു സിങ്ക് നാമം/ഇന്‍ഡക്സും പോര്‍ട്ട് നാമവും നല്‍കേണ്ടതുണ്ടു്"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "പ്രവര്‍ത്തിപ്പിക്കുവാനുള്ള മാതൃകയുടെ പേരു് നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "ഒരു സോഴ്സ് നാമം/ഇന്‍ഡക്സും പോര്‍ട്ട് നാമവും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "ഒരു സോഴ്സ് നാമം/ഇന്‍ഡക്സും പോര്‍ട്ട് നാമവും നല്‍കേണ്ടതുണ്ടു്"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "ഒരു മൌഡ്യൂള്‍ ഇന്‍ഡക്സ് നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "പ്രവര്‍ത്തിപ്പിക്കുവാനുള്ള മാതൃകയുടെ പേരു് നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "ഒരു സിങ്ക് നാമം/ഇന്‍ഡക്സും വോള്യവും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "ഒരു സിങ്ക് നാമം/ഇന്‍ഡക്സും വോള്യവും നല്‍കേണ്ടതുണ്ടു്"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "ഒരു മൌഡ്യൂള്‍ ഇന്‍ഡക്സ് നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "ഒരു സോഴ്സ് നാമം/ഇന്‍ഡക്സും വോള്യവും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "ഒരു സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സും വോള്യവും നല്‍കേണ്ടതുണ്ടു്"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "തെറ്റായ സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സ്"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "ഒരു സോഴ്സ് നാമം/ഇന്‍ഡക്സും വോള്യവും നല്‍കേണ്ടതുണ്ടു്"
@@ -3127,83 +4081,141 @@ msgid "Invalid sink input index"
 msgstr "തെറ്റായ സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സ്"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "ഒരു സോഴ്സ് ഔട്ട്പുട്ട് ഇന്‍ഡക്സും സോഴ്സും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "തെറ്റായ സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സ്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ഒരു സിങ്ക് നാമം/ഇന്‍ഡക്സും മ്യൂട്ട് ബൂളിയനും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "തെറ്റായ മാതൃക വിവരണം"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ഒരു സോഴ്സ് നാമം/ഇന്‍ഡക്സും മ്യൂട്ട് ബൂളിയനും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "ഒരു സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സും മ്യൂട്ട് ബൂളിയനും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "തെറ്റായ സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സ് സ്പെസിഫിക്കേഷന്‍"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "തെറ്റായ സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സ് സ്പെസിഫിക്കേഷന്‍"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "ഒരു സോഴ്സ് നാമം/ഇന്‍ഡക്സും മ്യൂട്ട് ബൂളിയനും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "തെറ്റായ സിങ്ക് ഇന്‍പുട്ട് ഇന്‍ഡക്സ് സ്പെസിഫിക്കേഷന്‍"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "ഒരു സിങ്ക് നാമം/ഇന്‍ഡക്സും പോര്‍ട്ട് നാമവും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "ഒരു സിങ്ക് നാമം/ഇന്‍ഡക്സും മ്യൂട്ട് ബൂളിയനും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "ഒരു കാര്‍ഡ് നാമം/ഇന്‍ഡക്സും പ്രൊഫൈല്‍ നാമവും നല്‍കേണ്ടതുണ്ടു്"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "ശരിയായ കമാന്‍ഡുകള്‍ നല്‍കിയിട്ടില്ല."
 
diff --git a/po/mr.po b/po/mr.po
index 035c5ad0c..a97f37a5a 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:54+0000\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
@@ -169,10 +173,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail यास बूलीयन बाब अपेक्षीत आहे"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level यास लॉग स्तरीय बाब अपेक्षीत आहे (एकतर क्षेत्र 0..4 अंतर्गत संख्यायी किंवा "
 "debug, info, notice, warn, error पैकी एक)."
@@ -589,7 +599,11 @@ msgid "Line In"
 msgstr "लाइन-इन"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "माइक्रोफोन"
 
@@ -612,12 +626,20 @@ msgid "Internal Microphone"
 msgstr "आंतरीक माइक्रोफोन"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "रेडिओ"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "विडिओ"
 
@@ -656,12 +678,20 @@ msgid "No Bass Boost"
 msgstr "बूस्ट अशक्य"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "ऍनलॉग हेडफोन्स्"
 
@@ -719,6 +749,204 @@ msgstr "डिजीटल स्टिरीओ (HDMI)"
 #, fuzzy
 msgid "Digital Input (S/PDIF)"
 msgstr "डिजीटल स्टिरीओ (HDMI)"
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-mixer.c:2816
+msgid "Multichannel Input"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2817
+#, fuzzy
+msgid "Multichannel Output"
+msgstr "Null आऊटपुट"
+
+#: src/modules/alsa/alsa-mixer.c:2818
+#, fuzzy
+msgid "Game Output"
+msgstr "Null आऊटपुट"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "Null आऊटपुट"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "इंपुट"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "ऍनलॉग सर्राउंड 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "ऍनलॉग मोनो"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "ऍनलॉग मोनो"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "ऍनलॉग मोनो"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "ऍनलॉग स्टिरीओ"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "मोनो"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "स्टिरीओ"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+#, fuzzy
+msgid "Speakerphone"
+msgstr "ऍनलॉग स्टिरीओ"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "ऍनलॉग सर्राउंड 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "ऍनलॉग सर्राउंड 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "ऍनलॉग सर्राउंड 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "ऍनलॉग सर्राउंड 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "ऍनलॉग सर्राउंड 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "ऍनलॉग सर्राउंड 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "ऍनलॉग सर्राउंड 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "ऍनलॉग सर्राउंड 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "ऍनलॉग सर्राउंड 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "ऍनलॉग सर्राउंड 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "ऍनलॉग सर्राउंड 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "डिजीटल स्टिरीओ (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "डिजीटल सर्राउंड 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "डिजीटल सर्राउंड 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+#, fuzzy
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "डिजीटल सर्राउंड 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "डिजीटल स्टिरीओ (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+#, fuzzy
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "डिजीटल सर्राउंड 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "ऍनलॉग मोनो ड्युप्लेक्स्"
+
+#: src/modules/alsa/alsa-mixer.c:4733
+msgid "Analog Stereo Duplex"
+msgstr "ऍनलॉग स्टिरीओ ड्युप्लेक्स्"
+
+#: src/modules/alsa/alsa-mixer.c:4736
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "डिजीटल स्टिरीओ ड्युप्लेक्स् (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4738
+#, fuzzy
+msgid "Stereo Duplex"
+msgstr "ऍनलॉग स्टिरीओ ड्युप्लेक्स्"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+msgid "Off"
+msgstr "बंद करा"
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, fuzzy, c-format
+msgid "%s Output"
+msgstr "Null आऊटपुट"
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, fuzzy, c-format
+msgid "%s Input"
+msgstr "इंपुट"
+
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 
 #: src/modules/alsa/alsa-mixer.c:2816
 msgid "Multichannel Input"
@@ -915,6 +1143,7 @@ msgid "%s Input"
 msgstr "इंपुट"
 
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -929,7 +1158,11 @@ msgstr ""
 "POLLOUT द्वारे सज्ज होणे शक्य आहे -- तरी परस्पर snd_pcm_avail() ने 0 पूरविले किंवा इतर "
 "मूल्य < min_avail असावे."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1019,6 +1252,16 @@ msgstr[1] ""
 "हे सहसा ALSA ड्राइवर '%s' अंतर्गत बग अशू शकते. कृपया या अडचणीस ALSA डेव्हलपर करीता "
 "कळवा."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1027,19 +1270,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "ऍनलॉग आऊटपुट"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "ऍनलॉग हेडफोन्स्"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1057,15 +1328,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "हाय फिडेलिटी प्लेबॅक (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "हाय फिडीलीटी कॅपचर (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1079,6 +1370,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1139,8 +1431,13 @@ msgstr ""
 "नाव> label=<ladspa प्लगइन लेबल> control=<इंपुट कंट्रोल मुल्यांची स्वल्पविराम विभाजीत "
 "सूची>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1176,11 +1473,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "क्लॉक्ड् NULL सींक"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null आऊटपुट"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null आऊटपुट"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "स्रोत माहिती प्राप्त करण्यास अपयशी: %s"
@@ -1203,14 +1508,24 @@ msgstr "@HOSTNAME@ वरील ऑडिओ"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1242,7 +1557,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "अपरिचीत त्रुटी कोड"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1441,6 +1760,90 @@ msgstr "वरील समोरचे उजवे"
 #: src/pulse/channelmap.c:160
 msgid "Top Rear Center"
 msgstr "वरील पाठीमागचे मध्य"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "वरील पाठीमागचे डावे"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "वरील पाठीमागचे उजवे"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(अवैध)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "सराऊन्ड 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "सराऊन्ड 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "सराऊन्ड 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "सराऊन्ड 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "सराऊन्ड 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() अपयशी: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "कुकी डेटा वाचण्यास अपयशी"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "अपरिचीत वाढ '%s' करीता संदेश प्राप्त झाले"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "इंपुट"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "Null आऊटपुट"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(अवैध)"
+
+=======
 
 #: src/pulse/channelmap.c:161
 msgid "Top Rear Left"
@@ -1524,6 +1927,7 @@ msgstr ""
 msgid "invalid"
 msgstr "(अवैध)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulsecore/core-util.c:1790
 #, c-format
 msgid ""
@@ -1561,11 +1965,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] अवैध लॉग लक्ष्य '%s'."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "आंतरीक ऑडिओ"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "आंतरीक ऑडिओ"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "मोडेम"
 
@@ -1841,7 +2253,11 @@ msgstr "स्ट्रीम रिकामे करण्यास अपय
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "जुळवणी अपयशी: %s"
@@ -2035,7 +2451,11 @@ msgstr ""
 "libpulse %s शी कंपाई केले\n"
 "libpulse %s शी लिंक केले\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "अवैध क्लाएंटचे नाव '%s'"
@@ -2106,7 +2526,11 @@ msgid ""
 "specification from file."
 msgstr "सावधानता: निर्देशीत चाचणी संयोजना फाइलमधील संयोजनाशी खोडून पुनः लिहीली जाईल."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "फाइलपासून चाचणी संयोजना माहिती प्राप्त करण्यास अपयशी."
 
@@ -2141,7 +2565,11 @@ msgstr "प्लेबॅक"
 msgid "Failed to set media name."
 msgstr "आदेश ओळ वाचण्यास अपयशी."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() अपयशी."
 
@@ -2149,11 +2577,19 @@ msgstr "pa_mainloop_new() अपयशी."
 msgid "io_new() failed."
 msgstr "io_new() अपयशी."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() अपयशी."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() अपयशी."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() अपयशी: %s"
@@ -2162,6 +2598,23 @@ msgstr "pa_context_connect() अपयशी: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rrttime_new() अपयशी."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() अपयशी."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() अपयशी."
@@ -2177,6 +2630,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2188,7 +2642,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2224,7 +2682,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2232,6 +2694,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2241,6 +2714,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2256,7 +2730,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2324,17 +2802,37 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "आकडेवारी प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "वर्तमानक्षणी वापरणीत आहे: %2$s बाईटस् समाविष्टीत एकूण %1$u ब्लॉक्स् .\n"
 msgstr[1] "वर्तमानक्षणी वापरणीत आहे: %2$s बाईटस् समाविष्टीत एकूण %1$u ब्लॉक्स् .\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "संपूर्ण कार्यकाळवेळी लागू केले: %2$s बाईटस् समाविष्टीत एकूण %1$u ब्लॉक्स् .\n"
+msgstr[1] "संपूर्ण कार्यकाळवेळी लागू केले: %2$s बाईटस् समाविष्टीत एकूण %1$u ब्लॉक्स् .\n"
+
+#: src/utils/pactl.c:193
+=======
 
 #: src/utils/pactl.c:205
 #, fuzzy, c-format
@@ -2345,21 +2843,34 @@ msgstr[0] "संपूर्ण कार्यकाळवेळी लाग
 msgstr[1] "संपूर्ण कार्यकाळवेळी लागू केले: %2$s बाईटस् समाविष्टीत एकूण %1$u ब्लॉक्स् .\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "सॅपल कॅशे आकार: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "सर्वर माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2370,7 +2881,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2393,6 +2908,21 @@ msgstr ""
 "मुलभूत स्रोत: %s\n"
 "कुकीज: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2406,19 +2936,73 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "अपरिचीत आदेश"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "लाइन-इन"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "ऍनलॉग मोनो"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2462,11 +3046,16 @@ msgstr "ऍनलॉग मोनो"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "sink माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2505,37 +3094,66 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tपोर्टस्:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tसक्रीय पोर्ट: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tपोर्टस्:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "स्रोत माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2574,6 +3192,17 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2583,11 +3212,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "विभाग माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2604,12 +3238,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "क्लाऐंट माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2624,12 +3266,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "कार्ड माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2646,45 +3296,77 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tसंक्षिप्त माहिती:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tसक्रीय संक्षिप्त माहिती: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "सींक इंपुट माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2722,12 +3404,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "स्रोत आऊटपुट माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2765,12 +3455,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "सॅम्पल माहिती प्राप्त करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2800,21 +3498,44 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2824,16 +3545,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "सॅम्पल अपलोड करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2844,11 +3574,66 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "सॅम्पल अपलोड करण्यास अपयशी: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "फाइलची अयोग्य समाप्ती"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "फाइलची अयोग्य समाप्ती"
@@ -2898,19 +3683,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "अवैध सर्वर"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT प्राप्त झाले, बाहेर पडत आहे."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "अवैध खंडाची संयोजना"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT प्राप्त झाले, बाहेर पडत आहे."
@@ -2924,15 +3733,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "अवैध खंडाची संयोजना"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "अवैध खंडाची संयोजना"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2978,6 +3839,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2985,7 +3847,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3007,7 +3873,11 @@ msgstr ""
 "to\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3018,16 +3888,55 @@ msgstr ""
 "libpulse %s सह कंपाईल केले\n"
 "libpulse %s सह जुळले\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "अवैध स्ट्रीमचे नाव '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "कृपया दाखल करण्याजोगी तात्पूर्ती फाइल निर्देशीत करा"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "आवाज फाइल उघडण्यास अपयशी."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "सावधानता: फाइलपासून चाचणी संयोजना ओळखण्यास अपयशी."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "चालवण्याकरीता तुम्हाला तात्पूर्ते नाव निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "काढून टाकण्याकरीता तुम्हाला तात्पूर्ते नाव निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "तुम्हाला सींक इंपुट निर्देशांक व सींक निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "तुम्हाला आऊटपुट इंडेक्स स्रोत व स्रोत निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "तुम्हाला विभागाचे नाव व बाब निश्चित करावे लागेल."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "कृपया दाखल करण्याजोगी तात्पूर्ती फाइल निर्देशीत करा"
@@ -3061,28 +3970,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "तुम्हाला विभागाचे नाव व बाब निश्चित करावे लागेल."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "तुम्हाला विभाग इंडेक्स् निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "तुम्ही एकापेक्षा जास्त सींक निश्चित करू शकत नाही. तुम्हाला बूलीयन मूल्य निश्चित करावे लागेल."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "अवैध सॅम्पल संयोजना"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "तुम्ही एकापेक्षा जास्त स्रोत निश्चित करू शकत नाही. तुम्हाला बूलीयन मूल्य निश्चित करावे लागेल."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "तुम्हाला कार्डचे नाव/इंडेक्स् व प्रोफाइल नाव निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "तुम्हाला सींक नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "तुम्हाला कार्डचे नाव/इंडेक्स् व प्रोफाइल नाव निश्चित करावे लागेल"
@@ -3092,33 +4025,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "तुम्हाला सींक नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "चालवण्याकरीता तुम्हाला तात्पूर्ते नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "तुम्हाला स्रोत नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "तुम्हाला स्रोत नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "तुम्हाला विभाग इंडेक्स् निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "चालवण्याकरीता तुम्हाला तात्पूर्ते नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "तुम्हाला सींक नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "तुम्हाला सींक नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "तुम्हाला विभाग इंडेक्स् निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "तुम्हाला स्रोत नाव/इंडेक्स् व खंडाचे नाव निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "तुम्हाला सींक इंपुट इंडेक्स् व सींक निश्चित करावे लागेल"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "अवैध सींक इंपुट इंडेक्स्"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "तुम्हाला स्रोत नाव/इंडेक्स् व खंडाचे नाव निश्चित करावे लागेल"
@@ -3132,83 +4101,141 @@ msgid "Invalid sink input index"
 msgstr "अवैध सींक इंपुट इंडेक्स्"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "तुम्हाला आऊटपुट इंडेक्स स्रोत व स्रोत निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "अवैध सींक इंपुट इंडेक्स्"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "तुम्हाला सींक नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "अवैध सॅम्पल संयोजना"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "तुम्हाला स्रोत नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "तुम्हाला सींक इंपुट निर्देशांक व सींक निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "अवैध सींक इंपुट इंडेक्स् संयोजना"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "अवैध सींक इंपुट इंडेक्स् संयोजना"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "तुम्हाला स्रोत नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "अवैध सींक इंपुट इंडेक्स् संयोजना"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "तुम्हाला सींक नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "तुम्हाला सींक नाव/इंडेक्स् व पोर्टचे नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "तुम्हाला कार्डचे नाव/इंडेक्स् व प्रोफाइल नाव निश्चित करावे लागेल"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "वैध आदेश निश्चित केले नाही."
 
diff --git a/po/nl.po b/po/nl.po
index 0db78927f..580da0448 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,9 +9,15 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-03-30 23:01+0000\n"
+"Last-Translator: Pjotr Vertaalt <pjotrvertaalt@gmail.com>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-11-17 18:19+0000\n"
 "Last-Translator: Philip Goto <philip.goto@gmail.com>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: Dutch <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/nl/>\n"
 "Language: nl\n"
@@ -19,7 +25,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.5.2\n"
+=======
 "X-Generator: Weblate 4.14.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -151,6 +161,126 @@ msgstr ""
 "  na het opstarten\n"
 "\n"
 "  -n  Laad het standaard-scriptbestand niet\n"
+<<<<<<< HEAD
+
+#: src/daemon/cmdline.c:246
+msgid "--daemonize expects boolean argument"
+msgstr "--daemonize verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:254
+msgid "--fail expects boolean argument"
+msgstr "--fail verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:265
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+msgstr ""
+"--log-level verwacht een log level argument (numeriek uit de reeks 0..4 of "
+"een van type debug, info, notice, warn, error)."
+
+#: src/daemon/cmdline.c:277
+msgid "--high-priority expects boolean argument"
+msgstr "--high-priority verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:285
+msgid "--realtime expects boolean argument"
+msgstr "--realtime verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:293
+msgid "--disallow-module-loading expects boolean argument"
+msgstr "--disallow-module-loading verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:301
+msgid "--disallow-exit expects boolean argument"
+msgstr "--disallow-exit verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:309
+msgid "--use-pid-file expects boolean argument"
+msgstr "--use-pid-file verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:328
+msgid ""
+"Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Ongeldig logboekdoel: gebruik 'syslog', 'journal', 'stderr' of 'auto' of een "
+"geldige bestandsnaam 'bestand:<pad>', 'nieuwbestand:<pad>'."
+
+#: src/daemon/cmdline.c:330
+msgid ""
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
+"name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Ongeldig logboekdoel: gebruik 'syslog', 'stderr' of 'auto' of een geldige "
+"bestandsnaam 'bestand:<pad>', 'nieuwbestand:<pad>'."
+
+#: src/daemon/cmdline.c:338
+msgid "--log-time expects boolean argument"
+msgstr "--log-time verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:346
+msgid "--log-meta expects boolean argument"
+msgstr "--log-meta verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:366
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "Ongeldige herbemonsteringsmethode '%s'."
+
+#: src/daemon/cmdline.c:373
+msgid "--system expects boolean argument"
+msgstr "--system verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:381
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "--no-cpu-limit verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:389
+msgid "--disable-shm expects boolean argument"
+msgstr "--disable-shm verwacht een booleaans argument"
+
+#: src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr "--enable-memfd verwacht een booleaans argument"
+
+#: src/daemon/daemon-conf.c:270
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] Ongeldig logboekdoel '%s'."
+
+#: src/daemon/daemon-conf.c:285
+#, c-format
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] Ongeldig logboekniveau '%s'."
+
+#: src/daemon/daemon-conf.c:300
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] Ongeldige herbemonsteringsmethode ‘%s’."
+
+#: src/daemon/daemon-conf.c:322
+#, c-format
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] Ongeldige rlimit ‘%s’."
+
+#: src/daemon/daemon-conf.c:342
+#, c-format
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr "[%s:%u] Ongeldig bemonsteringstype ‘%s’."
+
+#: src/daemon/daemon-conf.c:359 src/daemon/daemon-conf.c:376
+#, c-format
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr "[%s:%u] Ongeldige bemonsteringsrate ‘%s’."
+
+#: src/daemon/daemon-conf.c:399
+#, c-format
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr "[%s:%u] Ongeldige bemonsteringskanalen ‘%s’."
+
+#: src/daemon/daemon-conf.c:416
+=======
 
 #: src/daemon/cmdline.c:246
 msgid "--daemonize expects boolean argument"
@@ -1124,10 +1254,1201 @@ msgstr ""
 
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr "FFT-gebaseerd mengpaneel op %s"
 
+<<<<<<< HEAD
+#: src/daemon/daemon-conf.c:433
+#, c-format
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr "[%s:%u] Ongeldig aantal fragmenten '%s'."
+
+#: src/daemon/daemon-conf.c:450
+#, c-format
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr "[%s:%u] Ongeldige fragmentgrootte ‘%s’."
+
+#: src/daemon/daemon-conf.c:467
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr "[%s:%u] Ongeldig nice niveau ‘%s’."
+
+#: src/daemon/daemon-conf.c:552
+#, c-format
+msgid "[%s:%u] Invalid server type '%s'."
+msgstr "[%s:%u] Ongeldig servertype '%s'."
+
+#: src/daemon/daemon-conf.c:685
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "Kon instellingenbestand niet openen: %s"
+
+#: src/daemon/daemon-conf.c:701
+msgid ""
+"The specified default channel map has a different number of channels than "
+"the specified default number of channels."
+msgstr ""
+"De opgegeven standaardkanalenkaart heeft een ander aantal kanalen dan het "
+"opgegeven standaardaantal kanalen."
+
+#: src/daemon/daemon-conf.c:788
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### Lees uit het configuratiebestand: %s ###\n"
+
+#: src/daemon/dumpmodules.c:57
+#, c-format
+msgid "Name: %s\n"
+msgstr "Naam: %s\n"
+
+#: src/daemon/dumpmodules.c:60
+#, c-format
+msgid "No module information available\n"
+msgstr "Geen module-informatie beschikbaar\n"
+
+#: src/daemon/dumpmodules.c:63
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versie: %s\n"
+
+#: src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Description: %s\n"
+msgstr "Beschrijving: %s\n"
+
+#: src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Author: %s\n"
+msgstr "Auteur: %s\n"
+
+#: src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Gebruik: %s\n"
+
+#: src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Laad eenmaal: %s\n"
+
+#: src/daemon/dumpmodules.c:72
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "ACHTERHAALDHEIDSWAARSCHUWING: %s\n"
+
+#: src/daemon/dumpmodules.c:76
+#, c-format
+msgid "Path: %s\n"
+msgstr "Pad: %s\n"
+
+#: src/daemon/ltdl-bind-now.c:75
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "Openen van module %s mislukte: %s"
+
+#: src/daemon/ltdl-bind-now.c:126
+msgid "Failed to find original lt_dlopen loader."
+msgstr "Kon de originele lt_dlopen lader niet vinden."
+
+#: src/daemon/ltdl-bind-now.c:131
+msgid "Failed to allocate new dl loader."
+msgstr "Kon de nieuwe dl lader niet toekennen."
+
+#: src/daemon/ltdl-bind-now.c:144
+msgid "Failed to add bind-now-loader."
+msgstr "Kon bind-now-loader niet toevoegen."
+
+#: src/daemon/main.c:265
+#, c-format
+msgid "Failed to find user '%s'."
+msgstr "Kon gebruiker '%s' niet vinden."
+
+#: src/daemon/main.c:270
+#, c-format
+msgid "Failed to find group '%s'."
+msgstr "Kon groep ‘%s’ niet vinden."
+
+#: src/daemon/main.c:279
+#, c-format
+msgid "GID of user '%s' and of group '%s' don't match."
+msgstr "GID van gebruiker ‘%s’ en van groep ‘%s’ passen niet bij elkaar."
+
+#: src/daemon/main.c:284
+#, c-format
+msgid "Home directory of user '%s' is not '%s', ignoring."
+msgstr "Persoonlijke map van gebruiker ‘%s’ is niet ‘%s’, wordt genegeerd."
+
+#: src/daemon/main.c:287 src/daemon/main.c:292
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "Aanmaken van ‘%s’ mislukte: %s"
+
+#: src/daemon/main.c:299
+#, c-format
+msgid "Failed to change group list: %s"
+msgstr "Veranderen van groepslijst mislukt: %s"
+
+#: src/daemon/main.c:315
+#, c-format
+msgid "Failed to change GID: %s"
+msgstr "Veranderen van GID mislukt: %s"
+
+#: src/daemon/main.c:331
+#, c-format
+msgid "Failed to change UID: %s"
+msgstr "Veranderen van UID mislukt: %s"
+
+#: src/daemon/main.c:360
+msgid "System wide mode unsupported on this platform."
+msgstr "Systeembrede modus wordt op dit platform niet ondersteund."
+
+#: src/daemon/main.c:650
+msgid "Failed to parse command line."
+msgstr "Lezen van de opdrachtregel mislukte."
+
+#: src/daemon/main.c:689
+msgid ""
+"System mode refused for non-root user. Only starting the D-Bus server lookup "
+"service."
+msgstr ""
+"Systeemmodus geweigerd voor niet-rootgebruiker. Alleen de D-Bus-server "
+"zoekdienst wordt gestart."
+
+#: src/daemon/main.c:788
+#, c-format
+msgid "Failed to kill daemon: %s"
+msgstr "Uitschakelen van achtergronddienst mislukte: %s"
+
+#: src/daemon/main.c:817
+msgid ""
+"This program is not intended to be run as root (unless --system is "
+"specified)."
+msgstr ""
+"Dit programma is niet bedoeld om als root gedraaid te worden (behalve als --"
+"system is opgegeven)."
+
+#: src/daemon/main.c:820
+msgid "Root privileges required."
+msgstr "Beheerdersrechten vereist."
+
+#: src/daemon/main.c:827
+msgid "--start not supported for system instances."
+msgstr "--start wordt niet ondersteund voor systeeminstanties."
+
+#: src/daemon/main.c:867
+#, c-format
+msgid "User-configured server at %s, refusing to start/autospawn."
+msgstr ""
+"Door gebruiker geconfigureerde server op %s, die weigert te starten/"
+"autospawn."
+
+#: src/daemon/main.c:873
+#, c-format
+msgid ""
+"User-configured server at %s, which appears to be local. Probing deeper."
+msgstr ""
+"Door gebruiker geconfigureerde server op %s, die lokaal lijkt te zijn. Wordt "
+"dieper onderzocht."
+
+#: src/daemon/main.c:878
+msgid "Running in system mode, but --disallow-exit not set."
+msgstr "Draaiend in systeemmodus, maar --disallow-exit is niet ingesteld."
+
+#: src/daemon/main.c:881
+msgid "Running in system mode, but --disallow-module-loading not set."
+msgstr ""
+"Draaiend in systeemmodus, maar --disallow-module-loading is niet ingesteld."
+
+#: src/daemon/main.c:884
+msgid "Running in system mode, forcibly disabling SHM mode."
+msgstr "Draaiend in systeemmodus, met geforceerd uitzetten van SHM-modus."
+
+#: src/daemon/main.c:889
+msgid "Running in system mode, forcibly disabling exit idle time."
+msgstr "Draaiend in systeemmodus, met geforceerd uitzetten van exit idle time."
+
+#: src/daemon/main.c:922
+msgid "Failed to acquire stdio."
+msgstr "Verkrijgen van stdio mislukte."
+
+#: src/daemon/main.c:928 src/daemon/main.c:999
+#, c-format
+msgid "pipe() failed: %s"
+msgstr "pipe() mislukte: %s"
+
+#: src/daemon/main.c:933 src/daemon/main.c:1004
+#, c-format
+msgid "fork() failed: %s"
+msgstr "fork() mislukte: %s"
+
+#: src/daemon/main.c:948 src/daemon/main.c:1019 src/utils/pacat.c:562
+#, c-format
+msgid "read() failed: %s"
+msgstr "read() mislukte: %s"
+
+#: src/daemon/main.c:954
+msgid "Daemon startup failed."
+msgstr "Kon geen achtergronddienst opstarten."
+
+#: src/daemon/main.c:987
+#, c-format
+msgid "setsid() failed: %s"
+msgstr "setsid() mislukte: %s"
+
+#: src/daemon/main.c:1119
+msgid "Failed to get machine ID"
+msgstr "Machine-ID verkrijgen mislukt"
+
+#: src/daemon/main.c:1145
+msgid ""
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\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é, dus u draait PA in systeemmodus. Dat kunt u waarschijnlijk beter niet "
+"doen.\n"
+"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:1161
+msgid "pa_pid_file_create() failed."
+msgstr "pa_pid_file_create() mislukte."
+
+#: src/daemon/main.c:1193
+msgid "pa_core_new() failed."
+msgstr "pa_core_new() mislukte."
+
+#: src/daemon/main.c:1268
+msgid "command line arguments"
+msgstr "opdrachtregelargumenten"
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+"Kon achtergronddienst niet starten wegens fouten bij het uitvoeren van "
+"opstartopdrachten. Bron van opdrachten: %s"
+
+#: src/daemon/main.c:1280
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr "Achtergronddienst opstarten zonder geladen modules, dat werkt niet."
+
+#: src/daemon/pulseaudio.desktop.in:4
+msgid "PulseAudio Sound System"
+msgstr "PulseAudio geluidssysteem"
+
+#: src/daemon/pulseaudio.desktop.in:5
+msgid "Start the PulseAudio Sound System"
+msgstr "Start het PulseAudio geluidssysteem"
+
+#: src/modules/alsa/alsa-mixer.c:2708
+msgid "Input"
+msgstr "Invoer"
+
+#: src/modules/alsa/alsa-mixer.c:2709
+msgid "Docking Station Input"
+msgstr "Dokstation-invoer"
+
+#: src/modules/alsa/alsa-mixer.c:2710
+msgid "Docking Station Microphone"
+msgstr "Dokstation-microfoon"
+
+#: src/modules/alsa/alsa-mixer.c:2711
+msgid "Docking Station Line In"
+msgstr "Dokstation-Lijn In"
+
+#: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
+msgid "Line In"
+msgstr "Lijn-in"
+
+#: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+msgid "Microphone"
+msgstr "Microfoon"
+
+#: src/modules/alsa/alsa-mixer.c:2714 src/modules/alsa/alsa-mixer.c:2798
+msgid "Front Microphone"
+msgstr "Microfoon voorkant"
+
+#: src/modules/alsa/alsa-mixer.c:2715 src/modules/alsa/alsa-mixer.c:2799
+msgid "Rear Microphone"
+msgstr "Microfoon achterkant"
+
+#: src/modules/alsa/alsa-mixer.c:2716
+msgid "External Microphone"
+msgstr "Externe microfoon"
+
+#: src/modules/alsa/alsa-mixer.c:2717 src/modules/alsa/alsa-mixer.c:2801
+msgid "Internal Microphone"
+msgstr "Interne microfoon"
+
+#: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+#: src/utils/pactl.c:295
+msgid "Radio"
+msgstr "Radio"
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:296
+msgid "Video"
+msgstr "Video"
+
+#: src/modules/alsa/alsa-mixer.c:2720
+msgid "Automatic Gain Control"
+msgstr "Automatische toenamebeheersing"
+
+#: src/modules/alsa/alsa-mixer.c:2721
+msgid "No Automatic Gain Control"
+msgstr "Geen automatische toenamebeheersing"
+
+#: src/modules/alsa/alsa-mixer.c:2722
+msgid "Boost"
+msgstr "Versterking"
+
+#: src/modules/alsa/alsa-mixer.c:2723
+msgid "No Boost"
+msgstr "Geen versterking"
+
+#: src/modules/alsa/alsa-mixer.c:2724
+msgid "Amplifier"
+msgstr "Versterker"
+
+#: src/modules/alsa/alsa-mixer.c:2725
+msgid "No Amplifier"
+msgstr "Geen versterker"
+
+#: src/modules/alsa/alsa-mixer.c:2726
+msgid "Bass Boost"
+msgstr "Basversterking"
+
+#: src/modules/alsa/alsa-mixer.c:2727
+msgid "No Bass Boost"
+msgstr "Geen basversterking"
+
+#: src/modules/alsa/alsa-mixer.c:2728
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+msgid "Speaker"
+msgstr "Luidspreker"
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:286
+msgid "Headphones"
+msgstr "Koptelefoons"
+
+#: src/modules/alsa/alsa-mixer.c:2796
+msgid "Analog Input"
+msgstr "Analoge invoer"
+
+#: src/modules/alsa/alsa-mixer.c:2800
+msgid "Dock Microphone"
+msgstr "Dokmicrofoon"
+
+#: src/modules/alsa/alsa-mixer.c:2802
+msgid "Headset Microphone"
+msgstr "Hoofdsetmicrofoon"
+
+#: src/modules/alsa/alsa-mixer.c:2806
+msgid "Analog Output"
+msgstr "Analoge uitvoer"
+
+#: src/modules/alsa/alsa-mixer.c:2808
+msgid "Headphones 2"
+msgstr "Koptelefoon 2"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+msgid "Headphones Mono Output"
+msgstr "Mono-uitvoer voor koptelefoons"
+
+#: src/modules/alsa/alsa-mixer.c:2810
+msgid "Line Out"
+msgstr "Lijn-uit"
+
+#: src/modules/alsa/alsa-mixer.c:2811
+msgid "Analog Mono Output"
+msgstr "Analoge mono-uitvoer"
+
+#: src/modules/alsa/alsa-mixer.c:2812
+msgid "Speakers"
+msgstr "Luidsprekers"
+
+#: src/modules/alsa/alsa-mixer.c:2813
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
+
+#: src/modules/alsa/alsa-mixer.c:2814
+msgid "Digital Output (S/PDIF)"
+msgstr "Digitale uitvoer (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2815
+msgid "Digital Input (S/PDIF)"
+msgstr "Digitale invoer (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2816
+msgid "Multichannel Input"
+msgstr "Meerkanalige invoer"
+
+#: src/modules/alsa/alsa-mixer.c:2817
+msgid "Multichannel Output"
+msgstr "Meerkanalige uitvoer"
+
+#: src/modules/alsa/alsa-mixer.c:2818
+msgid "Game Output"
+msgstr "Uitvoer voor spellen"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+msgid "Chat Output"
+msgstr "Uitvoer voor kletsen"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+msgstr "Invoer voor kletsen"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+msgid "Virtual Surround 7.1"
+msgstr "Virtual surround 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "Analoog mono"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+msgid "Analog Mono (Left)"
+msgstr "Analoog mono (links)"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+msgid "Analog Mono (Right)"
+msgstr "Analoog mono (rechts)"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "Analoog stereo"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "Mono"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr "Hoofdset"
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+msgid "Speakerphone"
+msgstr "Luidsprekertelefoon"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr "Meerkanalig"
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "Analoog surround 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "Analoog surround 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "Analoog surround 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "Analoog surround 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "Analoog surround 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "Analoog surround 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "Analoog surround 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "Analoog surround 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "Analoog surround 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "Analoog surround 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "Analoog surround 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "Digitaal stereo (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Digitaal surround 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Digitaal surround 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Digitaal surround 5.1 (IEC958/DTS)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "Digitaal stereo (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Digitaal surround 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr "Kletsen"
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr "Spel"
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "Analoog mono duplex"
+
+#: src/modules/alsa/alsa-mixer.c:4733
+msgid "Analog Stereo Duplex"
+msgstr "Analoog stereo duplex"
+
+#: src/modules/alsa/alsa-mixer.c:4736
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "Digitaal stereo duplex (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr "Meerkanalig duplex"
+
+#: src/modules/alsa/alsa-mixer.c:4738
+msgid "Stereo Duplex"
+msgstr "Stereo duplex"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr "Mono Chat + 7.1 Surround"
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+msgid "Off"
+msgstr "Uit"
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, c-format
+msgid "%s Output"
+msgstr "%s uitvoer"
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, c-format
+msgid "%s Input"
+msgstr "%s invoer"
+
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+#, 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 ""
+"ALSA maakte ons wakker om nieuwe gegevens naar het apparaat te schrijven, "
+"maar er was niets om weg te schrijven.\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars.\n"
+"We werden gewekt met POLLOUT ingesteld -- echter een opvolgende "
+"snd_pcm_avail() gaf 0 terug of een andere waarde < min_avail."
+
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, 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 ""
+"ALSA maakte ons wakker om nieuwe gegevens van het apparaat te lezen, maar er "
+"was niets om te lezen.\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars.\n"
+"We werden gewekt met POLLIN ingesteld -- echter een opvolgende "
+"snd_pcm_avail() gaf 0 terug of een andere waarde < min_avail."
+
+#: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_avail() gaf een waarde terug die uitzonderlijk groot is: %lu byte "
+"(%lu ms).\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
+msgstr[1] ""
+"snd_pcm_avail() gaf een waarde terug die uitzonderlijk groot is: %lu bytes "
+"(%lu ms).\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
+
+#: src/modules/alsa/alsa-util.c:1249
+#, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() gaf een waarde terug die uitzonderlijk groot is: %li byte (%s"
+"%lu ms).\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
+msgstr[1] ""
+"snd_pcm_delay() gaf een waarde terug die uitzonderlijk groot is: %li bytes "
+"(%s%lu ms).\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, 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 ""
+"snd_pcm_avail_delay() gaf vreemde waardes terug: vertraging %lu is minder "
+"dan %lu.\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma '%s'. Meld dit "
+"probleem aan de ALSA-ontwikkelaars."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() gaf een waarde terug die uitzonderlijk groot is: %lu "
+"byte (%lu ms).\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
+msgstr[1] ""
+"snd_pcm_mmap_begin() gaf een waarde terug die uitzonderlijk groot is: %lu "
+"bytes (%lu ms).\n"
+"Waarschijnlijk is dit een fout in het ALSA-stuurprogramma ‘%s’. Meld dit "
+"probleem alstublieft aan de ALSA-ontwikkelaars."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth-invoer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth-uitvoer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Handenvrij"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Koptelefoon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Draagbaar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Auto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefoon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "High Fidelity afspelen (A2DP Sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "High Fidelity opnemen (A2DP bron)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Hoofdset hoofdeenheid (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Hoofdset Audio Gateway (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Handenvrije koptelefooneenheid (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Handenvrije Audio Gateway (HFP)"
+
+#: src/modules/echo-cancel/module-echo-cancel.c:59
+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> use_master_format=<yes "
+"or no> "
+msgstr ""
+"source_name=<naam voor de bron> source_properties=<eigenschappen voor de "
+"bron> source_master=<naam van te filteren bron> sink_name=<naam voor de "
+"afvoer> sink_properties=<eigenschappen voor de afvoer> sink_master=<naam van "
+"te filteren afvoer> adjust_time=<hoe vaak rates bij te stellen in s> "
+"adjust_threshold=<how much drift to readjust after in ms> format=<sample "
+"format> rate=<sample rate> channels=<aantal kanalen> "
+"channel_map=<kanalenkaart> aec_method=<te gebruiken implementatie> "
+"aec_args=<parameters voor de AEC engine> save_aec=<sla AEC-gegevens op in /"
+"tmp> autoloaded=<ingesteld idnien deze module automatisch wordt geladen> "
+"use_volume_sharing=<ja of nee> use_master_format=<ja of nee> "
+
+#. add on profile
+#: src/modules/macosx/module-coreaudio-device.c:825
+msgid "On"
+msgstr "Aan"
+
+#: src/modules/module-allow-passthrough.c:71
+#: src/modules/module-always-sink.c:80
+msgid "Dummy Output"
+msgstr "Dummy-uitvoer"
+
+#: src/modules/module-always-sink.c:34
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr ""
+"Houd altijd ten minste één afvoer ingeladen zelfs als het de null-afvoer is"
+
+#: src/modules/module-always-source.c:35
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr ""
+"Houd altijd ten minste één bron ingeladen zelfs als het een null-bron is"
+
+#: src/modules/module-equalizer-sink.c:68
+msgid "General Purpose Equalizer"
+msgstr "Mengpaneel algemeen"
+
+#: src/modules/module-equalizer-sink.c:72
+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=<naam van de afvoer> sink_properties=<eigenschappen voor de "
+"afvoer> sink_master=<afvoer waarmee moet worden verbonden> format=<sample "
+"format> rate=<sample rate> channels=<aantal kanalen> "
+"channel_map=<kanalenkaart> autoloaded=<ingesteld indien deze module "
+"automatisch wordt geladen> use_volume_sharing=<ja of nee> "
+
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr "FFT-gebaseerd mengpaneel op %s"
+
+#: src/modules/module-filter-apply.c:47
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr "autoclean=<ongebruikte filters automatisch lossen?>"
+
+#: src/modules/module-ladspa-sink.c:50
+msgid "Virtual LADSPA sink"
+msgstr "Virtuele LADSPA afvoer"
+
+#: src/modules/module-ladspa-sink.c:54
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"sink_input_properties=<properties for the sink input> master=<name of sink "
+"to filter> 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> autoloaded=<set if this module "
+"is being loaded automatically> "
+msgstr ""
+"sink_name=<naam voor de afvoer> sink_properties=<eigenschappen voor de "
+"afvoer> sink_input_properties=<eigenschappen voor de afvoer-invoer> "
+"master=<naam van te filteren afvoer> sink_master=<naam van te filteren "
+"afvoer> format=<sample format> rate=<sample rate> channels=<aantal kanalen> "
+"channel_map=<invoerkanalenkaart> plugin=<ladspa invoegselnaam> label=<ladspa "
+"invoegseletiket> control=<kommagescheiden lijst van "
+"invoerbeheersingswaarden> input_ladspaport_map=<kommagescheiden lijst van "
+"invoer LADSPA poortnamen> output_ladspaport_map=<kommagescheiden lijst van "
+"uitvoer LADSPA poortnamen> autoloaded=<ingesteld indien deze module "
+"automatisch wordt geladen> "
+
+#: src/modules/module-null-sink.c:46
+msgid "Clocked NULL sink"
+msgstr "Geklokte NULL afvoer"
+
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null-uitvoer"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+#, c-format
+msgid "Failed to set format: invalid format string %s"
+msgstr "Kon geen opmaak instellen: ongeldige opmaaktekenreeks %s"
+
+#: src/modules/module-rygel-media-server.c:506
+#: src/modules/module-rygel-media-server.c:544
+#: src/modules/module-rygel-media-server.c:903
+msgid "Output Devices"
+msgstr "Uitvoerapparaten"
+
+#: src/modules/module-rygel-media-server.c:507
+#: src/modules/module-rygel-media-server.c:545
+#: src/modules/module-rygel-media-server.c:904
+msgid "Input Devices"
+msgstr "Invoerapparaten"
+
+#: src/modules/module-rygel-media-server.c:1061
+msgid "Audio on @HOSTNAME@"
+msgstr "Geluid op @HOSTNAME@"
+
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr "Tunnel voor %s@%s"
+
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+#, c-format
+msgid "Tunnel to %s/%s"
+msgstr "Tunnel naar %s/%s"
+
+#: src/modules/module-virtual-surround-sink.c:50
+msgid "Virtual surround sink"
+msgstr "Virtuele surround afvoer"
+
+#: src/modules/module-virtual-surround-sink.c:54
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> 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 hrir_left=/path/to/"
+"left_hrir.wav hrir_right=/path/to/optional/right_hrir.wav autoloaded=<set if "
+"this module is being loaded automatically> "
+msgstr ""
+"sink_name=<naam voor de afvoer> sink_properties=<eigenschappen voor de "
+"afvoer> master=<naam van te filteren afvoer> sink_master=<naam van te "
+"filteren afvoer> format=<sample format> rate=<sample rate> channels=<aantal "
+"kanalen> channel_map=<kanalenkaart> use_volume_sharing=<ja of nee> "
+"force_flat_volume=<ja of nee> hrir=/path/to/left_hrir.wav hrir_left=/path/to/"
+"left_hrir.wav hrir_right=/path/to/optional/right_hrir.wav "
+"autoloaded=<ingesteld indien deze module automatisch wordt geladen> "
+
+#: src/modules/raop/module-raop-discover.c:295
+msgid "Unknown device model"
+msgstr "Onbekend apparaatmodel"
+
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr "RAOP standaardprofiel"
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio-geluidsserver"
+
+#: src/pulse/channelmap.c:105
+msgid "Front Center"
+msgstr "Voor midden"
+
+#: src/pulse/channelmap.c:106
+msgid "Front Left"
+msgstr "Voor links"
+
+#: src/pulse/channelmap.c:107
+msgid "Front Right"
+msgstr "Voor rechts"
+
+#: src/pulse/channelmap.c:109
+msgid "Rear Center"
+msgstr "Achter midden"
+
+#: src/pulse/channelmap.c:110
+msgid "Rear Left"
+msgstr "Achter links"
+
+#: src/pulse/channelmap.c:111
+msgid "Rear Right"
+msgstr "Achter rechts"
+
+#: src/pulse/channelmap.c:113
+msgid "Subwoofer"
+msgstr "Subwoofer"
+
+#: src/pulse/channelmap.c:115
+msgid "Front Left-of-center"
+msgstr "Voor links-van-het-midden"
+
+#: src/pulse/channelmap.c:116
+msgid "Front Right-of-center"
+msgstr "Voor rechts-van-het-midden"
+
+#: src/pulse/channelmap.c:118
+msgid "Side Left"
+msgstr "Zijkant links"
+
+#: src/pulse/channelmap.c:119
+msgid "Side Right"
+msgstr "Zijkant rechts"
+
+#: src/pulse/channelmap.c:121
+msgid "Auxiliary 0"
+msgstr "Hulpbron 0"
+
+#: src/pulse/channelmap.c:122
+msgid "Auxiliary 1"
+msgstr "Hulpbron 1"
+
+#: src/pulse/channelmap.c:123
+msgid "Auxiliary 2"
+msgstr "Hulpbron 2"
+
+#: src/pulse/channelmap.c:124
+msgid "Auxiliary 3"
+msgstr "Hulpbron 3"
+
+#: src/pulse/channelmap.c:125
+msgid "Auxiliary 4"
+msgstr "Hulpbron 4"
+
+#: src/pulse/channelmap.c:126
+msgid "Auxiliary 5"
+msgstr "Hulpbron 5"
+
+#: src/pulse/channelmap.c:127
+msgid "Auxiliary 6"
+msgstr "Hulpbron 6"
+
+#: src/pulse/channelmap.c:128
+msgid "Auxiliary 7"
+msgstr "Hulpbron 7"
+
+#: src/pulse/channelmap.c:129
+msgid "Auxiliary 8"
+msgstr "Hulpbron 8"
+
+#: src/pulse/channelmap.c:130
+msgid "Auxiliary 9"
+msgstr "Hulpbron 9"
+
+#: src/pulse/channelmap.c:131
+msgid "Auxiliary 10"
+msgstr "Hulpbron 10"
+
+#: src/pulse/channelmap.c:132
+msgid "Auxiliary 11"
+msgstr "Hulpbron 11"
+
+#: src/pulse/channelmap.c:133
+msgid "Auxiliary 12"
+msgstr "Hulpbron 12"
+
+#: src/pulse/channelmap.c:134
+msgid "Auxiliary 13"
+msgstr "Hulpbron 13"
+
+#: src/pulse/channelmap.c:135
+msgid "Auxiliary 14"
+msgstr "Hulpbron 14"
+
+#: src/pulse/channelmap.c:136
+msgid "Auxiliary 15"
+msgstr "Hulpbron· 15"
+
+#: src/pulse/channelmap.c:137
+msgid "Auxiliary 16"
+msgstr "Hulpbron 16"
+
+#: src/pulse/channelmap.c:138
+msgid "Auxiliary 17"
+msgstr "Hulpbron 17"
+
+#: src/pulse/channelmap.c:139
+msgid "Auxiliary 18"
+msgstr "Hulpbron 18"
+
+#: src/pulse/channelmap.c:140
+msgid "Auxiliary 19"
+msgstr "Hulpbron 19"
+
+#: src/pulse/channelmap.c:141
+msgid "Auxiliary 20"
+msgstr "Hulpbron 20"
+
+#: src/pulse/channelmap.c:142
+msgid "Auxiliary 21"
+msgstr "Hulpbron 21"
+
+#: src/pulse/channelmap.c:143
+msgid "Auxiliary 22"
+msgstr "Hulpbron 22"
+
+#: src/pulse/channelmap.c:144
+msgid "Auxiliary 23"
+msgstr "Hulpbron 23"
+
+#: src/pulse/channelmap.c:145
+msgid "Auxiliary 24"
+msgstr "Hulpbron 24"
+
+#: src/pulse/channelmap.c:146
+msgid "Auxiliary 25"
+msgstr "Hulpbron 25"
+
+#: src/pulse/channelmap.c:147
+msgid "Auxiliary 26"
+msgstr "Hulpbron 26"
+
+#: src/pulse/channelmap.c:148
+msgid "Auxiliary 27"
+msgstr "Hulpbron 27"
+
+#: src/pulse/channelmap.c:149
+msgid "Auxiliary 28"
+msgstr "Hulpbron 28"
+
+#: src/pulse/channelmap.c:150
+msgid "Auxiliary 29"
+msgstr "Hulpbron 29"
+
+#: src/pulse/channelmap.c:151
+msgid "Auxiliary 30"
+msgstr "Hulpbron 30"
+
+#: src/pulse/channelmap.c:152
+msgid "Auxiliary 31"
+msgstr "Hulpbron 31"
+
+#: src/pulse/channelmap.c:154
+msgid "Top Center"
+msgstr "Boven midden"
+
+#: src/pulse/channelmap.c:156
+msgid "Top Front Center"
+msgstr "Boven midden voor"
+
+#: src/pulse/channelmap.c:157
+msgid "Top Front Left"
+msgstr "Boven voor links"
+
+#: src/pulse/channelmap.c:158
+msgid "Top Front Right"
+msgstr "Boven voor rechts"
+
+#: src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "Boven achter midden"
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "Boven achter links"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "Boven achter rechts"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(ongeldig)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "Surround 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "Surround 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "Surround 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "Surround 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "Surround 7.1"
+
+=======
 #: src/modules/module-filter-apply.c:47
 msgid "autoclean=<automatically unload unused filters?>"
 msgstr "autoclean=<ongebruikte filters automatisch lossen?>"
@@ -1463,6 +2784,7 @@ msgstr "Surround 5.1"
 msgid "Surround 7.1"
 msgstr "Surround 7.1"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
 msgid "xcb_connect() failed"
 msgstr "xcb_connect() mislukte"
@@ -1546,11 +2868,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Ongeldig logboekdoel."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Ingebouwde audio"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Ingebouwde audio"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1825,7 +3155,11 @@ msgstr "Kon monitorstroom niet instellen: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Verbindingsfout: %s"
@@ -1864,7 +3198,11 @@ msgid "pa_stream_update_timing_info() failed: %s"
 msgstr "pa_stream_update_timing_info() mislukte: %s"
 
 #: src/utils/pacat.c:676
+<<<<<<< HEAD
+#, c-format
+=======
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "%s\n"
@@ -2015,7 +3353,11 @@ msgstr ""
 "Gecompileerd met libpulse %s\n"
 "Gelinkt met libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Ongeldige cliëntnaam ‘%s’"
@@ -2049,11 +3391,19 @@ msgstr "Ongeldige eigenschap ‘%s’"
 #, c-format
 msgid "Unknown file format %s."
 msgstr "Ongeldige bestandssoort %s."
+<<<<<<< HEAD
 
 #: src/utils/pacat.c:1000
 msgid "Failed to parse the argument for --monitor-stream"
 msgstr "Kon het argument voor --monitor-stream niet lezen"
 
+=======
+
+#: src/utils/pacat.c:1000
+msgid "Failed to parse the argument for --monitor-stream"
+msgstr "Kon het argument voor --monitor-stream niet lezen"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:1011
 msgid "Invalid sample specification"
 msgstr "Ongeldige bemonsteringsspecificatie"
@@ -2088,7 +3438,11 @@ msgstr ""
 "Waarschuwing: opgegeven bemonsteringsspecificatie zal overschreven worden "
 "met de specificatie van het bestand."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Bepalen van bemonsteringsspecificatie van het bestand mislukte."
 
@@ -2124,7 +3478,11 @@ msgstr "afspelen"
 msgid "Failed to set media name."
 msgstr "Kon geen medianaam instellen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() mislukte."
 
@@ -2132,11 +3490,19 @@ msgstr "pa_mainloop_new() mislukte."
 msgid "io_new() failed."
 msgstr "io_new() mislukte."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_cotext_new() mislukte."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_cotext_new() mislukte."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() mislukte: %s"
@@ -2145,6 +3511,23 @@ msgstr "pa_context_connect() mislukte: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() mislukte."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() mislukte."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAAM [ARG...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAAM|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() mislukte."
@@ -2160,6 +3543,7 @@ msgstr "NAAM|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAAM"
 
@@ -2171,6 +3555,79 @@ msgstr "NAAM|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+msgid "NAME|#N 1|0"
+msgstr "NAAM|#N 1|0"
+
+#: src/utils/pacmd.c:57
+msgid "#N 1|0"
+msgstr "#N 1|0"
+
+#: src/utils/pacmd.c:58
+msgid "NAME|#N KEY=VALUE"
+msgstr "NAAM|#N KEY=VALUE"
+
+#: src/utils/pacmd.c:59
+msgid "#N KEY=VALUE"
+msgstr "#N SLEUTEL=WAARDE"
+
+#: src/utils/pacmd.c:61
+msgid "#N"
+msgstr "#N"
+
+#: src/utils/pacmd.c:62
+msgid "NAME SINK|#N"
+msgstr "NAAM AFVOER|#N"
+
+#: src/utils/pacmd.c:64 src/utils/pacmd.c:65
+msgid "NAME FILENAME"
+msgstr "NAAM BESTANDSNAAM"
+
+#: src/utils/pacmd.c:66
+msgid "PATHNAME"
+msgstr "PADNAAM"
+
+#: src/utils/pacmd.c:67
+msgid "FILENAME SINK|#N"
+msgstr "BESTANDSNAAM AFVOER|#N"
+
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+msgid "#N SINK|SOURCE"
+msgstr "#N AFVOER|BRON"
+
+#: src/utils/pacmd.c:71 src/utils/pacmd.c:77 src/utils/pacmd.c:78
+msgid "1|0"
+msgstr "1|0"
+
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KAARTPROFIEL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAAM|#N POORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr "KAART_NAAM|KAART-#N POORT OFFSET"
+
+#: src/utils/pacmd.c:75
+msgid "TARGET"
+msgstr "DOEL"
+
+#: src/utils/pacmd.c:76
+msgid "NUMERIC-LEVEL"
+msgstr "NUMERIEK-NIVEAU"
+
+#: src/utils/pacmd.c:79
+msgid "FRAMES"
+msgstr ""
+
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
 msgid "NAME|#N 1|0"
 msgstr "NAAM|#N 1|0"
@@ -2242,6 +3699,7 @@ msgstr "FRAMES"
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "ONTVANGER BERICHT [PARAMETERS_BERICHT]"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:82
 #, c-format
@@ -2286,11 +3744,19 @@ msgstr "connect(): %s"
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
 msgstr "PulseAudio-achtergronddienst uitzetten mislukt."
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:181
 msgid "Daemon not responding."
 msgstr "Achtergronddienst reageert niet."
 
+=======
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "Achtergronddienst reageert niet."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
@@ -2306,12 +3772,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Verkrijgen van statistieken mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2319,7 +3793,11 @@ msgstr[0] "Op dit moment in gebruik: %u blok bevattende in totaal %s bytes.\n"
 msgstr[1] ""
 "Op dit moment in gebruik: %u blokken bevattende in totaal %s bytes.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2331,11 +3809,28 @@ msgstr[1] ""
 "Toegewezen tijdens de gehele levensduur: %u blokken bevattende in totaal %s "
 "bytes.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Grootte van tijdelijke bemonsteringsopslag: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+#, c-format
+msgid "Failed to get server information: %s"
+msgstr "Serverinformatie verkrijgen mislukte: %s"
+
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
 #, c-format
 msgid "Failed to get server information: %s"
@@ -2347,6 +3842,7 @@ msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2363,7 +3859,11 @@ msgstr ""
 "Cliënt-index: %u\n"
 "Tegelgrootte: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2386,6 +3886,74 @@ msgstr ""
 "Standaardbron: %s\n"
 "Cookie:  %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "beschikbaarheid onbekend"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "beschikbaar"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "niet beschikbaar"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Lijn"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mic"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Oortje"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Netwerk"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analoog"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "beschikbaarheid onbekend"
@@ -2452,11 +4020,16 @@ msgstr "Analoog"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Verkrijgen afvoerinformatie mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2495,37 +4068,66 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPoorten:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (type: %s, prioriteit: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", beschikbaarheid groep: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", beschikbaarheid groep: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tActieve poort: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tBestandssoorten:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Verkrijgen van broninformatie mislukt: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2564,6 +4166,17 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n.v.t."
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2573,11 +4186,16 @@ msgid "n/a"
 msgstr "n.v.t."
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Verkrijgen van module-informatie mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2594,12 +4212,20 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Verkrijgen van cliëntinformatie mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2614,12 +4240,20 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Verkrijgen van kaartinformatie mislukt: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2636,22 +4270,38 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfielen:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (sinks: %u, bronnen: %u, prioriteit: %u, beschikbaar: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tActief profiel: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
@@ -2659,7 +4309,11 @@ msgstr ""
 "\t\t%s: %s (type: %s, prioriteit: %u, latentie-offset: %<PRId64> usec%s%s, "
 "%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2668,17 +4322,29 @@ msgstr ""
 "\t\t\tEigenschappen:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tDeel van profiel(en): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Verkrijgen van afvoer-invoerinformatie mislukt: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2717,12 +4383,20 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Verkrijgen van bron-uitvoerinformatie mislukt: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2761,12 +4435,20 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Verkrijgen van bemonsteringsinformatie mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2795,16 +4477,41 @@ msgstr ""
 "\tEigenschappen:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Mislukking: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Bericht versturen mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr "list-handlers bericht mislukte: %s"
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr "list-handlers bericht kon niet correct worden gelezen"
+
+#: src/utils/pactl.c:951
+#, fuzzy
+msgid "list-handlers message response is not a JSON array"
+msgstr "list-handlers bericht kon niet correct worden gelezen"
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2820,16 +4527,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr "list-handlers bericht kon niet correct worden gelezen"
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr "list-handlers bericht kon niet correct worden gelezen"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Kon module niet uitschakelen: Module %s niet geladen"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2844,11 +4560,46 @@ msgstr[1] ""
 "Kon geen volume instellen: u probeerde om volumes in te stellen voor %d "
 "kanalen, terwijl ondersteunde kanalen = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Laden van bemonstering mislukte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Voortijdig einde van bestand"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nieuw"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "veranderen"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "verwijderen"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "onbekend"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "afvoer"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "bron"
+
+#: src/utils/pactl.c:1400
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Voortijdig einde van bestand"
@@ -2878,9 +4629,25 @@ msgid "source"
 msgstr "bron"
 
 #: src/utils/pactl.c:2167
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "sink-input"
 msgstr "afvoerinvoer"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "bron-uitvoer"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "module"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "cliënt"
+
+#: src/utils/pactl.c:1412
+=======
 #: src/utils/pactl.c:2170
 msgid "source-output"
 msgstr "bron-uitvoer"
@@ -2894,9 +4661,21 @@ msgid "client"
 msgstr "cliënt"
 
 #: src/utils/pactl.c:2179
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "sample-cache"
 msgstr "voorbeeldcache"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kaart"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2182
 msgid "server"
 msgstr "server"
@@ -2906,10 +4685,78 @@ msgid "card"
 msgstr "kaart"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Gebeurtenis '%s' op %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Kreeg SIGINT, bezig met afsluiten."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Ongeldige volume-opgave"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volume buiten toegestaan bereik.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ongeldig aantal volumespecificaties.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Onsamenhangende volumespecificatie.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opties]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYPE]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "BESTANDSNAAM [NAAM]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAAM [AFVOER]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAAM|#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAAM|#N 1|0|omschakelen"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|omschakelen"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N BESTANDSSOORTEN"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Kreeg SIGINT, bezig met afsluiten."
@@ -2975,6 +4822,7 @@ msgid "#N FORMATS"
 msgstr "#N BESTANDSSOORTEN"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2985,8 +4833,13 @@ msgstr ""
 "De speciale namen @DEFAULT_SINK@, @DEFAULT_SOURCE@ en @DEFAULT_MONITOR@\n"
 "kunnen worden gebruikt om de standaardafvoer, -bron en -monitor te bepalen.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -3005,7 +4858,11 @@ msgstr ""
 " -s, --server=SERVER    De naam van de server waarmee verbonden moet worden\n"
 " -n, --client-name=NAME    Hoe deze cliënt te noemen op de server\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3016,16 +4873,31 @@ msgstr ""
 "Gecompileerd met libpulse %s\n"
 "Gelinkt met libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Ongeldige formaatwaarde ‘%s’"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Geef niets op, of één van: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Geef a.u.b. een te laden bemonsteringsbestand op"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Openen geluidsbestand mislukt."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Geef a.u.b. een te laden bemonsteringsbestand op"
@@ -3035,10 +4907,38 @@ msgid "Failed to open sound file."
 msgstr "Openen geluidsbestand mislukt."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Waarschuwing: Bepalen van bemonsteringsspecificatie vanuit bestand mislukte."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "U dient een bemonsteringsnaam op te geven om af te spelen"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "U dient een bemonsteringsnaam op te geven om te verwijderen"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "U dient een afvoer-invoerindex en een afvoer op te geven"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "U dient een bron-uitvoerindex en een bron op te geven"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "U dient een modulenaam en argumenten op te geven."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "U dient een module-index of naam op te geven"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "U dient een bemonsteringsnaam op te geven om af te spelen"
@@ -3064,17 +4964,26 @@ msgid "You have to specify a module index or name"
 msgstr "U dient een module-index of naam op te geven"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "U kunt niet meer dan één afvoer opgeven. U dient een booleaanse waarde op te "
 "geven."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Ongeldige pauzeerspecificatie."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Ongeldige pauzeerspecificatie."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3082,6 +4991,63 @@ msgstr ""
 "U kunt niet meer dan één bron opgeven. U dient een booleaanse waarde op te "
 "geven."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "U dient een kaartnaam/index en een profielnaam op te geven"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "U dient een afvoernaam/index en een poortnaam op te geven"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "U dient een afvoernaam op te geven"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "U dient een bronnaam/index en een poortnaam op te geven"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "U dient een bronnaam op te geven"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "U dient een afvoernaam op te geven"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "U dient een afvoernaam/index en een volume op te geven"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "U dient een bronnaam op te geven"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "U dient een bronnaam/index en een volume op te geven"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "U dient een afvoer-invoerindex en een volume op te geven"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Ongeldige afvoer-invoerindex"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "U dient een bron-uitvoerindex en een volume op te geven"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Ongeldige bron-uitvoerindex"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "U dient een kaartnaam/index en een profielnaam op te geven"
@@ -3135,36 +5101,58 @@ msgid "Invalid source output index"
 msgstr "Ongeldige bron-uitvoerindex"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "U dient een afvoernaam/index en een dempingsactie (0, 1, of 'toggle') op te "
 "geven"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Ongeldige dempingsspecificatie"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Ongeldige dempingsspecificatie"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "U dient een bronnaam/index en een dempingsactie (0, 1, of 'toggle') op te "
 "geven"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "U dient een afvoer-invoerindex en een dempingsactie (0, 1, or 'toggle') op "
 "te geven"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Ongeldige specificatie voor afvoer-invoerindex"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Ongeldige specificatie voor afvoer-invoerindex"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3172,6 +5160,17 @@ msgstr ""
 "U dient een bronnaam/index en een dempingsactie (0, 1, of 'toggle') op te "
 "geven"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Ongeldige specificatie voor bronuitvoerindex"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "U dient tenminste een objectpad en een berichtnaam op te geven"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Ongeldige specificatie voor bronuitvoerindex"
@@ -3181,6 +5180,7 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "U dient tenminste een objectpad en een berichtnaam op te geven"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
@@ -3188,7 +5188,11 @@ msgstr ""
 "Teveel argumenten opgegeven; ze zullen worden genegeerd. Merk op dat alle "
 "berichtparameters moeten worden opgegeven als een enkele tekenreeks."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3196,16 +5200,28 @@ msgstr ""
 "U dient een afvoerindex op te geven en een puntkomma-gescheiden lijst van "
 "ondersteunde bestandssoorten"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "U dient een kaartnaam/index, een poortnaam en een latentie-offset op te geven"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Kon latentie-offset niet lezen"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Kon latentie-offset niet lezen"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Geen geldige opdracht opgegeven."
 
diff --git a/po/nn.po b/po/nn.po
index c088352d5..70f1b7630 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,8 +7,13 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-03-11 20:01+0000\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-05-23 11:18+0000\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <https://translate.fedoraproject.org/"
 "projects/pulseaudio/pulseaudio/nn/>\n"
@@ -17,7 +22,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.5.1\n"
+=======
 "X-Generator: Weblate 4.12.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -171,10 +180,17 @@ msgstr "«--fail» forventar boolsk argument"
 #: src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
+<<<<<<< HEAD
+"of debug, info, notice, warn, error)."
+msgstr ""
+"«--log-level» forventar loggnivå-argument (anten eit tal frå 0 til 4 eller "
+"«debug», «info», «notice», «warn» eller «error»)"
+=======
 "of error, warn, notice, info, debug)."
 msgstr ""
 "«--log-level» forventar loggnivå-argument (anten eit tal frå 0 til 4 eller "
 "«error», «warn», «notice», «info» eller «debug»)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:277
 msgid "--high-priority expects boolean argument"
@@ -592,7 +608,11 @@ msgid "Line In"
 msgstr "Linje inn"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -613,12 +633,20 @@ msgid "Internal Microphone"
 msgstr "Intern mikrofonen"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -655,12 +683,20 @@ msgid "No Bass Boost"
 msgstr "Inga bassforsterking"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Høgtalar"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Hovudtelefonar"
 
@@ -768,7 +804,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Hovudsett"
 
@@ -881,7 +921,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Mono-nettprat + 7.1-kringlyd"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Av"
 
@@ -895,6 +939,45 @@ msgstr "%s utlyd"
 msgid "%s Input"
 msgstr "%s innlyd"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+#, 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 ""
+"ALSA vekte oss for å skriva meir data til eininga, men det fanst ikkje noko "
+"data å skriva.\n"
+"Dette kjem truleg av ein feil i ALSA-drivaren «%s». Meld frå om problemet "
+"til ALSA-utviklarane.\n"
+"Me vart vekte med POLLOUT definert, men eit seinare snd_pcm_avail()-kall gav "
+"verdien 0 eller ein annan verdi < min_avail."
+
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, 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 ""
+"ALSA vekte oss for å lesa meir data frå eininga, men det fanst ikkje noko "
+"data å lesa.\n"
+"Dette kjem truleg av ein feil i ALSA-drivaren «%s». Meld frå om problemet "
+"til ALSA-utviklarane.\n"
+"Me vart vekte med POLLIN definert, men eit seinare subsequent "
+"snd_pcm_avail()-kall gav verdien 0 eller ein annan verdi < min_avail."
+
+#: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, c-format
+msgid ""
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
 #, c-format
 msgid ""
@@ -932,6 +1015,7 @@ msgstr ""
 #: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
 #, c-format
 msgid ""
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
 "ms).\n"
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
@@ -1005,6 +1089,64 @@ msgstr[1] ""
 "Dette kjem truleg av ein feil i ALSA-drivaren «%s». Meld frå om problemet "
 "til ALSA-utviklarane."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth-innlyd"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth-utlyd"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Handfri"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Hovudtelefonar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portabel"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Bil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "Hi-fi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Hi-fi-avspeling (A2DP-sluk)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Hi-fi-opptak (A2DP-kjelde)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Hovudsett-hovudeining (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Hovudsett-lydportnar (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Handfri-hovudeining (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1061,6 +1203,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Handfri-hovudeining (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Handfri-lydportnar (HFP)"
 
@@ -1121,6 +1264,15 @@ msgstr ""
 "sink_master=<sluk å kopla til> format=<samplingsformat> rate=<samplingsrate> "
 "channels=<talet på kanalar> channel_map=<kanaldefinisjon> autoloaded=<vel "
 "dette viss modulen vert lasta automatisk> use_volume_sharing=<yes eller no> "
+<<<<<<< HEAD
+
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr "FFT-basert lydbalanse­kontroll på %s"
+
+=======
 
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
@@ -1128,6 +1280,7 @@ msgstr ""
 msgid "FFT based equalizer on %s"
 msgstr "FFT-basert lydbalanse­kontroll på %s"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/module-filter-apply.c:47
 msgid "autoclean=<automatically unload unused filters?>"
 msgstr "autoclean=<skal ubrukte filter automatisk lastast ut?>"
@@ -1163,11 +1316,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Klokka NULL-sluk"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null-utdata"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null-utdata"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Klarte ikkje velja format: ugyldig formatspesifikasjon %s"
@@ -1190,14 +1351,24 @@ msgstr "Lyd på @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunell for %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunell til %s/%s"
@@ -1228,7 +1399,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Ukjend einingsmodell"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "RAOP-standardprofil"
 
@@ -1439,7 +1614,10 @@ msgstr "Oppe og bak til høgre"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(ugyldig)"
 
@@ -1548,11 +1726,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Ugyldig loggmål."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Innebygd lyd"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Innebygd lyd"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1832,7 +2018,11 @@ msgstr "Klarte ikkje velja avlyttingsstraum: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Feil ved pa_stream_connect_record()-kall: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Tilkoplingsfeil: %s"
@@ -1888,9 +2078,13 @@ msgid ""
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -d, --device=DEVICE                   The name of the sink/source to "
+<<<<<<< HEAD
+"connect to\n"
+=======
 "connect to. The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and "
 "@DEFAULT_MONITOR@ can be used to specify the default sink, source and "
 "monitor respectively.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 "      --stream-name=NAME                How to call this stream on the "
@@ -1952,9 +2146,14 @@ msgstr ""
 "  -v, --verbose                         Vis meir detaljerte meldingar.\n"
 "\n"
 "  -s, --server=TENAR                    Namnet på tenaren å kopla til.\n"
+<<<<<<< HEAD
+"  -d, --device=EINING                   Namnet på sluket/kjelda å kopla "
+"til.\n"
+=======
 "  -d, --device=EINING                   Namnet på sluket/kjelda å kopla til. "
 "Du kan bruka namna @DEFAULT_SINK@, @DEFAULT_SOURCE@ og @DEFAULT_MONITOR@ for "
 "å velja standard sluk/kjelde/avlyttar.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAMN                Kva klienten skal kallast på "
 "tenaren.\n"
 "      --stream-name=NAMN                Kva straumen skal kallast på "
@@ -2037,7 +2236,11 @@ msgstr ""
 "Kompilert med libpulse %s\n"
 "Lenkja til libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Ugyldig klientnamn «%s»"
@@ -2110,7 +2313,11 @@ msgstr ""
 "Åtvaring: Den valde samplingsspesifikasjonen vert overskriven av "
 "spesifikasjonen i fila."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Klarte ikkje fastsetja samplingsspesifikasjon frå fil."
 
@@ -2148,7 +2355,11 @@ msgstr "avspelings"
 msgid "Failed to set media name."
 msgstr "Klarte ikkje velja medienamn."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Feil ved pa_mainloop_new()-kall."
 
@@ -2156,11 +2367,19 @@ msgstr "Feil ved pa_mainloop_new()-kall."
 msgid "io_new() failed."
 msgstr "Feil ved io_new()-kall."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Feil ved pa_context_new()-kall."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Feil ved pa_context_new()-kall."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Feil ved pa_context_connect()-kall: %s"
@@ -2169,6 +2388,23 @@ msgstr "Feil ved pa_context_connect()-kall: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Feil ved pa_context_rttime_new()-kall."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Feil ved pa_mainloop_run()-kall."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAMN [ARGUMENT ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAMN|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Feil ved pa_mainloop_run()-kall."
@@ -2184,6 +2420,7 @@ msgstr "NAMN|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAMN"
 
@@ -2195,7 +2432,11 @@ msgstr "NAMN|#N LYDSTYRKE"
 msgid "#N VOLUME"
 msgstr "#N LYDSTYRKE"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAMN|#N 1|0"
 
@@ -2231,7 +2472,11 @@ msgstr "MAPPEADRESSE"
 msgid "FILENAME SINK|#N"
 msgstr "FILNAMN SLUK|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N SLUK|KJELDE"
 
@@ -2240,16 +2485,28 @@ msgid "1|0"
 msgstr "1|0"
 
 # Er snakk om to val her, ikkje ordet «card profile». Derfor særskrivinga.
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KORT PROFIL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KORT PROFIL"
 
 #: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N PORT"
 msgstr "NAMN|#N PORT"
 
 # «OFFSET is a number which represents the latency offset in microseconds»
+<<<<<<< HEAD
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "KORTNAMN|KORT-#N PORT LATENSTILLEGG"
 
@@ -2265,7 +2522,11 @@ msgstr "NUMERISK-NIVÅ"
 msgid "FRAMES"
 msgstr "RAMMER"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "MOTTAKAR MELDING [MELDINGSPARAMETRAR]"
 
@@ -2330,19 +2591,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Klarte ikkje henta statistikk: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "I bruk: %u blokk med til saman %s byte.\n"
 msgstr[1] "I bruk: %u blokker med til saman %s byte.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2352,22 +2625,39 @@ msgstr[1] ""
 "Reservert gjennom heile levetida: %u blokker med til saman %s byte.\n"
 
 # https://freedesktop.org/software/pulseaudio/doxygen/scache.html
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Samplingsmellomlager: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Klarte ikkje henta tenarinformasjon: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2384,7 +2674,11 @@ msgstr ""
 "Klientindeks: %u\n"
 "Flisstorleik: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2407,6 +2701,74 @@ msgstr ""
 "Standardkjelde: %s\n"
 "Infokapsel: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "ukjend tilgjengestatus"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "tilgjengeleg"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "ikkje tilgjengeleg"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Ukjend"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Linje"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mikrofon"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Telefonrøyr"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Øretelefon"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Nettverk"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analog"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "ukjend tilgjengestatus"
@@ -2473,11 +2835,16 @@ msgstr "Analog"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Klarte ikkje henta slukinformasjon: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2516,37 +2883,66 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortar:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (type: %s, prioritet: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", tilgjengegruppe: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", tilgjengegruppe: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktiv port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormat:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Klarte ikkje henta kjeldeinformasjon: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2585,6 +2981,17 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "–"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2594,11 +3001,16 @@ msgid "n/a"
 msgstr "–"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Klate ikkje henta modulinformasjon: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2615,12 +3027,20 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Klarte ikkje henta klientinformasjon: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2635,12 +3055,20 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Klarte ikkje henta kortinformasjon: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2657,22 +3085,38 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfilar:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (sluk: %u, kjelder: %u, prioritet: %u, tilgjengeleg: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktiv profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
@@ -2680,7 +3124,11 @@ msgstr ""
 "\t\t%s: %s (type: %s, prioritet: %u, latens­forskyving: %<PRId64> µs%s%s, "
 "%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2689,17 +3137,29 @@ msgstr ""
 "\t\t\tEigenskapar:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tDel av profil(ar): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Klarte ikkje henta informasjon om sluk-inndata: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2738,12 +3198,20 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Klarte ikkje henta informasjon om kjelde-utdata: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2782,12 +3250,20 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Klarte ikkje henta informasjon om sample: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2816,16 +3292,51 @@ msgstr ""
 "\tEigenskapar:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Feil: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Feil ved sending av melding: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr "Feil ved «list-handlers»-melding: %s"
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr "Klarte ikkje tolka «list-handlers»-meldinga"
+
+#: src/utils/pactl.c:951
+#, fuzzy
+msgid "list-handlers message response is not a JSON array"
+msgstr "Klarte ikkje tolka «list-handlers»-meldinga"
+
+#: src/utils/pactl.c:962
+#, fuzzy, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr "Klarte ikkje tolka «list-handlers»-meldinga"
+
+#: src/utils/pactl.c:1033
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "Klarte ikkje lasta ut modul: Modulen %s er ikkje lasta"
+
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2851,6 +3362,7 @@ msgid "Failed to unload module: Module %s not loaded"
 msgstr "Klarte ikkje lasta ut modul: Modulen %s er ikkje lasta"
 
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2865,11 +3377,74 @@ msgstr[1] ""
 "Klarte ikkje stilla lydstyrken: Du prøvde å stilla lydstyrken for %d "
 "kanalar, men støtta kanaltal er berre: %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Klarte ikkje lasta opp sample: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "For tidleg filslutt"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "ny"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "endra"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "fjern"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "ukjend"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "sluk"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "kjelde"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "kjelde-inndata"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "kjelde-utdata"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klient"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "sample-mellomlager"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "tenar"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kort"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "For tidleg filslutt"
@@ -2927,10 +3502,62 @@ msgid "card"
 msgstr "kort"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Hending «%s» på %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Fekk SIGINT. Avsluttar."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Ugyldig lydstyrke-spesifikasjon"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Lydstyrken er utanfor gyldig område.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ugyldig tal på lydstyrke-spesifikasjonar.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Inkonsekvent lydstyrke-spesifikasjon.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[val]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYPE]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "FILNAMN [NAMN]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAMN [SLUK]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAMN|#N LYDSTYRKE [LYDSTYRKE ...]"
+
+#: src/utils/pactl.c:1858
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Fekk SIGINT. Avsluttar."
@@ -2980,15 +3607,31 @@ msgid "NAME|#N VOLUME [VOLUME ...]"
 msgstr "NAMN|#N LYDSTYRKE [LYDSTYRKE ...]"
 
 #: src/utils/pactl.c:2654
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N VOLUME [VOLUME ...]"
 msgstr "#N LYDSTYRKE [LYDSTYRKE ...]"
 
 # «toggle» er ein fast verdi, og skal ikkje settast om.
+<<<<<<< HEAD
+#: src/utils/pactl.c:1859
+=======
 #: src/utils/pactl.c:2655
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0|toggle"
 msgstr "NAMN|#N 1|0|toggle"
 
 # «toggle» er ein fast verdi, og skal ikkje settast om.
+<<<<<<< HEAD
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMAT"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2656
 msgid "#N 1|0|toggle"
 msgstr "#N 1|0|toggle"
@@ -2998,6 +3641,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMAT"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3009,15 +3653,22 @@ msgstr ""
 "@DEFAULT_MONITOR@\n"
 "for å velja høvesvis standard sluk, kjelde og avlytting.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -n, --client-name=NAME                How to call this client on the "
@@ -3028,12 +3679,19 @@ msgstr ""
 "      --version                         Vis versjonsinformasjon.\n"
 "\n"
 "  -s, --server=TENAR                    Namnet på tenaren å kopla til.\n"
+<<<<<<< HEAD
+"  -n, --client-name=NAMN                Kva klienten skal kallast på "
+"tenaren.\n"
+
+#: src/utils/pactl.c:1909
+=======
 "  -f, --format=FORMAT                   Format på utdataa. Anten «normal» "
 "eller «json».\n"
 "  -n, --client-name=NAMN                Kva klienten skal kallast på "
 "tenaren.\n"
 
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3044,16 +3702,59 @@ msgstr ""
 "Kompilert med libpulse %s\n"
 "Lenkja til libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Ugyldig formatverdi: %s"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Vel ingenting eller ein av følgjande: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Vel sample-fil å lasta"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Klarte ikkje opna lydfil."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Åtvaring: Klarte ikkje fastsetja samplingsspesifikasjon frå fil."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Du må velja eit sample-namn å spela av"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Du må velja eit sample-namn å fjerna"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Du må velja ein indeks til sluk-inndata og eit sluk"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Du må velja ein indeks til kjelde-utdata og ei kjelde"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Du må velja eit modulnamn og tilhøyrande argument."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Du må velja ein modulindeks eller eit modulnamn"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Vel sample-fil å lasta"
@@ -3091,20 +3792,86 @@ msgid "You have to specify a module index or name"
 msgstr "Du må velja ein modulindeks eller eit modulnamn"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "Du kan ikkje velja meir enn eitt sluk. Du må oppgje ein boolsk verdi."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Ugyldig kvilemodus-spesifikasjon."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Ugyldig kvilemodus-spesifikasjon."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "Du kan ikkje velja meir enn éi kjelde. Du må oppgje ein boolsk verdi."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Du må velja eit kortnamn / ein kortindeks og eit profilnamn"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Du må velja eit sluknamn / ein slukindeks og eit portnamn"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Du må velja eit sluknamn"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Du må velja eit kjeldenamn / ein kjeldeindeks og eit portnamn"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Du må velja eit kjeldenamn"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Du må velja eit sluknamn"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Du må velja eit sluknamn / ein slukindeks og ein lydstyrke"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Du må velja eit kjeldenamn"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Du må velja eit kjeldenamn / ein kjeldeindeks og ein lydstyrke"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Du må velja ein indeks til sluk-inndata og ein lydstyrke"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Ugyldig indeks til sluk-inndata"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Du må velja ein indeks til kjelde-utdata og ein lydstyrke"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Ugyldig indeks til kjelde-utdata"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Du må velja eit kortnamn / ein kortindeks og eit profilnamn"
@@ -3158,41 +3925,74 @@ msgid "Invalid source output index"
 msgstr "Ugyldig indeks til kjelde-utdata"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du må velja eit sluknamn / ein slukindeks og ei dempehanding (0, 1 eller "
 "«toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Ugyldig dempespesifikasjon"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Ugyldig dempespesifikasjon"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du må velja eit kjeldenamn / ein kjeldeindeks og ei dempehanding (0, 1 eller "
 "«toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du må velja indeks til sluk-inndata og ei dempehanding (0, 1 eller «toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Ugyldig spesifikasjon av indeks til sluk-inndata"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Ugyldig spesifikasjon av indeks til sluk-inndata"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 "Du må velja indeks til kjelde-utdata og ei dempehanding (0, 1 eller «toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Ugyldig spesifikasjon av indeks til kjelde-utdata"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "Du må oppgje minst ei objektadresse og eit meldingsnamn"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Ugyldig spesifikasjon av indeks til kjelde-utdata"
@@ -3202,6 +4002,7 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Du må oppgje minst ei objektadresse og eit meldingsnamn"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
@@ -3209,24 +4010,40 @@ msgstr ""
 "Eventuelle ekstraargument ved ignorerte. Merk at alle meldings­parametrane må "
 "skrivast som éin tekststreng."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 "Du må velja indeks til eit sluk og ei semikolondelt liste av støtta format"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Du må velja eit kortnamn / ein kortindeks, eit portnamn og eit latentstid-"
 "tillegg"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Klarte ikkje tolka latenstid-tillegg"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Klarte ikkje tolka latenstid-tillegg"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Ingen gyldige kommandoar."
 
diff --git a/po/oc.po b/po/oc.po
index db97a2a10..421d517d2 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -13,7 +13,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio trunk\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2016-10-12 22:20+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
 "Language-Team: Tot En Òc\n"
@@ -106,7 +110,10 @@ msgid "--fail expects boolean argument"
 msgstr "--fail requerís un paramètre boolean"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+=======
 #, fuzzy
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
@@ -530,7 +537,11 @@ msgid "Line In"
 msgstr "Entrada linha"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Micrò"
 
@@ -551,12 +562,20 @@ msgid "Internal Microphone"
 msgstr "Microfòn intèrne"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Ràdio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Vidèo"
 
@@ -593,12 +612,20 @@ msgid "No Bass Boost"
 msgstr "Pas d'amplificacion de las bassas"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Nautparlaire"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Escotadors"
 
@@ -714,7 +741,11 @@ msgid "Stereo"
 msgstr "Esterèo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Casc àudio"
 
@@ -829,7 +860,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Atudat"
 
@@ -843,7 +878,11 @@ msgstr "%s Sortida"
 msgid "%s Input"
 msgstr "%s Entrada"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -854,7 +893,11 @@ msgid ""
 "returned 0 or another value < min_avail."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -947,6 +990,64 @@ msgstr[1] ""
 "S'agís fòrt probablament d'un bug dins lo pilòt ALSA « %s ». Raportatz "
 "aqueste problèma als desvolopaires d'ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Entrada Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Sortida Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Mans liuras"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Escotadors"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portable"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Telefòn de veitura"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefòn"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1003,6 +1104,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1051,8 +1153,13 @@ msgid ""
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1092,11 +1199,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Relòtge de la destinacion void"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Sortida voida"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Sortida voida"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Impossible de definir le format : nom de format invalid %s"
@@ -1119,14 +1234,24 @@ msgstr "Audio sus @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1155,6 +1280,15 @@ msgstr ""
 "dels noms dels pòrts d'entrada LADSPA separats per de virgulas> "
 "output_ladspaport_map=<lista dels noms dels pòrts de sortida LADSPA separats "
 "per de virgulas> "
+<<<<<<< HEAD
+
+#: src/modules/raop/module-raop-discover.c:295
+#, fuzzy
+msgid "Unknown device model"
+msgstr "Còde d'error desconegut"
+
+#: src/modules/raop/raop-sink.c:655
+=======
 
 #: src/modules/raop/module-raop-discover.c:295
 #, fuzzy
@@ -1162,6 +1296,7 @@ msgid "Unknown device model"
 msgstr "Còde d'error desconegut"
 
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1372,7 +1507,10 @@ msgstr "Arrièr dreita naut"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(invalid)"
 
@@ -1474,11 +1612,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Àudio integrat"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Àudio integrat"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modèm"
 
@@ -1755,7 +1901,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() a fracassat : %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Fracàs de connexion : %s"
@@ -1894,7 +2044,11 @@ msgstr ""
 "Compilat amb libpulse %s\n"
 "Ligat amb libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nom del client invalid « %s »"
@@ -1969,7 +2123,11 @@ msgstr ""
 "Avertiment : las especificacions de l'escandalhatge especificat seràn "
 "espotidas per las del fichièr."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 "Fracàs al moment de l'obtencion de las informacions de l'escandalhatge del "
@@ -2011,7 +2169,11 @@ msgstr "lectura"
 msgid "Failed to set media name."
 msgstr "Impossible de definir lo nom del supòrt."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() a fracassat."
 
@@ -2019,11 +2181,19 @@ msgstr "pa_mainloop_new() a fracassat."
 msgid "io_new() failed."
 msgstr "io_new() a fracassat."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() a fracassat."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() a fracassat."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Fracàs de pa_context_connect() : %s"
@@ -2032,6 +2202,23 @@ msgstr "Fracàs de pa_context_connect() : %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() a fracassat."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() a fracassat."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NOM [ARGS ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NOM|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() a fracassat."
@@ -2047,6 +2234,7 @@ msgstr "NOM|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NOM"
 
@@ -2058,7 +2246,11 @@ msgstr "NOM|#N VOLUM"
 msgid "#N VOLUME"
 msgstr "#N VOLUM"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NOM|#N 1|0"
 
@@ -2094,7 +2286,11 @@ msgstr "NOM D'ACCÈS"
 msgid "FILENAME SINK|#N"
 msgstr "NOMDELFICHIÈR COLLECTOR|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N COLLECTOR|FONT"
 
@@ -2102,6 +2298,17 @@ msgstr "#N COLLECTOR|FONT"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PERFIL DE LA CARTA"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NOM|#N PÒRT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PERFIL DE LA CARTA"
@@ -2111,6 +2318,7 @@ msgid "NAME|#N PORT"
 msgstr "NOM|#N PÒRT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NOM-DE-CARTA|CARTA-#N PÒRT OFFSET"
 
@@ -2126,7 +2334,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr "TRAMAS"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2189,19 +2401,31 @@ msgstr "poll() : %s"
 msgid "read(): %s"
 msgstr "read() : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Fracàs al moment de la recuperacion de las estatisticas : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "En cors d'utilizacion : %u blòts que conten al total %s octets.\n"
 msgstr[1] "En cors d'utilizacion : %u blòts que conten al total %s octets.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2213,23 +2437,39 @@ msgstr[1] ""
 "Atribuit pendent l'ensemble de la durada d'execucion : %u blòts que contenon "
 "al total %s octets.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Talha de l'amagatal de l'escandalhatge : %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 "Fracàs al moment de la recuperacion de las informacions del servidor : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2246,7 +2486,11 @@ msgstr ""
 "Indèx del client : %u\n"
 "Talha del teule : %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2269,6 +2513,21 @@ msgstr ""
 "Font per defaut : %s\n"
 "Cookie : %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2282,28 +2541,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "desconegut"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Entrada linha"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "Casc àudio"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2325,27 +2624,45 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "Entrada Bluetooth"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Monò analogic"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 "Fracàs al moment de l'obtencion de las informacions sus la destinacion : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2367,37 +2684,66 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPòrts :\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPòrt actiu : %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormats :\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Fracàs al moment de l'obtencion de las informacions sus la font : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2419,6 +2765,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/d"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2428,12 +2785,17 @@ msgid "n/a"
 msgstr "n/d"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 "Fracàs al moment de la recuperacion de las informacions sul modul  : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2450,13 +2812,21 @@ msgstr ""
 "\tProprietats : \n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 "Fracàs al moment de la recuperacion de las informacions sul client  : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2471,13 +2841,21 @@ msgstr ""
 "\tProprietats :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 "Fracàs al moment de la recuperacion de las informacions sus la carta  : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2494,28 +2872,48 @@ msgstr ""
 "\tProprietats :\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tPerfils :\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tPerfil actiu : %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2524,19 +2922,31 @@ msgstr ""
 "\t\t\tProprietats :\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tPartida del o dels perfil(s) : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 "Fracàs al moment de la recuperacion de las informacions sus l'entrada de la "
 "destinacion  : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2558,14 +2968,22 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 "Fracàs al moment de la recuperacion de las informacions sus la sortida de la "
 "font  : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2587,14 +3005,22 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 "Fracàs al moment de la recuperacion de las informacions sus l'escandalhatge "
 " : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2611,21 +3037,44 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Fracàs : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "Fracàs de read() : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2635,16 +3084,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Impossible de descargar lo modul : Modul %s pas cargat"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2655,11 +3113,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Impossible de mandar l'escandalhatge : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Fin de fichièr prematurada (EOF)."
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "novèl"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "cambiats"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "suprimir"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "desconegut"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "destinacion"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "font"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "entrada de collector"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "sortida de font"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "client"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "cache per l'escandalhatge"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "servidor"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "Carta"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Fin de fichièr prematurada (EOF)."
@@ -2717,10 +3238,78 @@ msgid "card"
 msgstr "Carta"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "eveniment '%s' sus %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT recebut, tampadura."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Especificacion de volume invalid"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volum de delà del sulhet autorizat.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opcions]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPE]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NOM_DE_FICHIÈR [NOM]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NOM [COLLECTOR]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NOM|#N 1|0|bascular"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|bascular"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATS"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT recebut, tampadura."
@@ -2786,6 +3375,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATS"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2797,8 +3387,13 @@ msgstr ""
 "pòdon èsser utilizats per especificar la destinacion, la font e lo monitor "
 "per defaut.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -2820,7 +3415,11 @@ msgstr ""
 "  -n, --client-name=NAME                Cossí apelar aqueste client sul "
 "servidor\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2831,16 +3430,31 @@ msgstr ""
 "Compilat amb libpulse %s\n"
 "Ligat amb libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Nom del flux invalid « %s »"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Especificar pas res, o una valor demest : %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Indicatz un fichièr d'escandalhatge de cargar"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Fracàs al moment de la dobertura d'un fichièr sonòr."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Indicatz un fichièr d'escandalhatge de cargar"
@@ -2850,11 +3464,39 @@ msgid "Failed to open sound file."
 msgstr "Fracàs al moment de la dobertura d'un fichièr sonòr."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Avertiment : Fracàs al moment de l'obtencion de las especificacions de "
 "l'escandalhatge del fichièr."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Vos cal indicar un nom d'escandalhatge de legir"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Vos cal indicar un nom d'escandalhatge de suprimir"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Vos cal indicar un indèx d'entrada de destinacion e una destinacion"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Vos cal indicar un indèx de sortida de font e una font"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Vos cal indicar un nom de modul e de paramètres."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Vos cal especificar l'indèx o lo nom d'un modul"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Vos cal indicar un nom d'escandalhatge de legir"
@@ -2880,21 +3522,53 @@ msgid "You have to specify a module index or name"
 msgstr "Vos cal especificar l'indèx o lo nom d'un modul"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Podètz pas indicar mai d'una destinacion. Vos cal indicar una valor booleana."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Especificacion de suspension invalida"
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Especificacion de suspension invalida"
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "Podètz pas indicar mai d'una font. Vos cal indicar una valor booleana."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Vos cal indicar un nom/un indèx de mapa e un nom de perfil"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Vos cal indicar un nom/un indèx de destinacion e un nom de pòrt"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Vos cal especificar lo nom de la destinacion"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Vos cal indicar un nom/un indèx de font e un nom de pòrt"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Vos cal especificar lo nom de la font"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Vos cal indicar un nom/un indèx de mapa e un nom de perfil"
@@ -2916,19 +3590,51 @@ msgid "You have to specify a source name"
 msgstr "Vos cal especificar lo nom de la font"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Vos cal especificar lo nom de la destinacion"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Vos cal indicar un nom/un indèx de destinacion e un volum"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Vos cal indicar un nom/un indèx de destinacion e un volum"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Vos cal especificar lo nom de la font"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Vos cal indicar un nom/un indèx de font e un volum"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Vos cal indicar un indèx d'entrada de destinacion e un volum"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Indèx invalid d'entrada de la destinacion"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Vos cal especificar un indèx de font àudio e un volum"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Indèx de font àudio invalid"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Vos cal indicar un nom/un indèx de font e un volum"
@@ -2950,51 +3656,89 @@ msgid "Invalid source output index"
 msgstr "Indèx de font àudio invalid"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Especificacion indicador mut invalid"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Especificacion indicador mut invalid"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Especificacion d'indèx d'entrada de la destinacion invalida"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Especificacion d'indèx d'entrada de la destinacion invalida"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Especificacion d'indèx de sortida activa invalida"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Especificacion d'indèx de sortida activa invalida"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Vos cal indicar un nom/un indèx de destinacion e un nom de pòrt"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3002,17 +3746,29 @@ msgstr ""
 "Vos cal especificar un indèx de collector e una lista dels formats preses en "
 "carga separada per de punt-virgulas"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Vos cal especificar un nom/indèx  de carta, un nom de pòrt e una "
 "compensacion de laténcia"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Impossible d'analisar la compensacion de la laténcia"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Impossible d'analisar la compensacion de la laténcia"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Cap de comanda valida pas indicada."
 
diff --git a/po/or.po b/po/or.po
index a57b339c9..46105693e 100644
--- a/po/or.po
+++ b/po/or.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.or\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:55+0000\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
@@ -184,10 +188,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail ବୁଲିଆନ ସ୍ୱତନ୍ତ୍ରଚର ଆଶା କରୁଅଛି"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of debug, info, notice, warn, error)."
@@ -605,7 +615,11 @@ msgid "Line In"
 msgstr "ଲାଇନ-ଇନ"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "ମାଇକ୍ରୋଫୋନ"
 
@@ -628,12 +642,20 @@ msgid "Internal Microphone"
 msgstr "ଆଭ୍ୟନ୍ତରୀଣ ମାଇକ୍ରୋଫୋନ"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "ରେଡିଓ"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "ଭିଡ଼ିଓ"
 
@@ -672,12 +694,20 @@ msgid "No Bass Boost"
 msgstr "ବୃଦ୍ଧି ନାହିଁ"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "ଏନାଲୋଗ ହେଡ଼ଫୋନଗୁଡ଼ିକ"
 
@@ -799,7 +829,11 @@ msgid "Stereo"
 msgstr "ଷ୍ଟେରିଓ"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -807,6 +841,7 @@ msgstr ""
 #, fuzzy
 msgid "Speakerphone"
 msgstr "ଏନାଲୋଗ ଷ୍ଟେରିଓ"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -852,6 +887,53 @@ msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 6.1"
 msgid "Analog Surround 7.0"
 msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 7.0"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 7.0"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4590
 msgid "Analog Surround 7.1"
 msgstr "ଏନାଲୋଗ ଚତୁଃ ପାର୍ଶ୍ୱ 7.1"
@@ -916,7 +998,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "ଅଫ"
 
@@ -930,7 +1016,11 @@ msgstr "ଶୂନ୍ୟ ଫଳାଫଳ"
 msgid "%s Input"
 msgstr "ନିବେଶ"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -947,7 +1037,11 @@ msgstr ""
 "We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
 "returned 0 or another value < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1046,6 +1140,16 @@ msgstr[1] ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1054,19 +1158,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "ଏନାଲୋଗ ଫଳାଫଳ"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "ଏନାଲୋଗ ହେଡ଼ଫୋନଗୁଡ଼ିକ"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1084,15 +1216,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "ଉଚ୍ଚ ଫିଡିଲିଟି ପଛଚଲା (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "ଉଚ୍ଚ ଫିଡିଲିଟି ପଛଚଲା (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1106,6 +1258,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1164,8 +1317,13 @@ msgstr ""
 "channel_map=<ଚ୍ୟାନେଲ ମ୍ୟାପ> plugin=<ladspa ପ୍ଲଗଇନ ନାମ> label=<ladspa ପ୍ଲଗଇନ "
 "ନାମପଟି> control=<କମା ଦ୍ୱାରା ପୃଥକ ନିବେଶ ନିୟନ୍ତ୍ରଣ ମୂଲ୍ୟ ତାଲିକା>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1200,11 +1358,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "ସମୟାନୁବର୍ତ୍ତି ଶୂନ୍ୟ ସିଙ୍କ"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "ଶୂନ୍ୟ ଫଳାଫଳ"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "ଶୂନ୍ୟ ଫଳାଫଳ"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "ଉତ୍ସ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
@@ -1227,14 +1393,24 @@ msgstr "@HOSTNAME@ ରେ ଧ୍ୱନି"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1265,7 +1441,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "ଅଜଣା ତ୍ରୁଟି ସଂକେତ"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1452,6 +1632,147 @@ msgstr "ଉପର କେନ୍ଦ୍ର"
 #: src/pulse/channelmap.c:156
 msgid "Top Front Center"
 msgstr "ଉପର ସମ୍ନା ପାଖ କେନ୍ଦ୍ର"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:157
+msgid "Top Front Left"
+msgstr "ଉପର ସାମ୍ନା ବାମ ପାଖ"
+
+#: src/pulse/channelmap.c:158
+msgid "Top Front Right"
+msgstr "ଉପର ସାମ୍ନା ଡ଼ାହାଣ ପାଖ"
+
+#: src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "ଉପର ପଛ ପାଖ କେନ୍ଦ୍ର"
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "ଉପର ପଛ ବାମ ପାଖ"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "ଉପର ପଛ ଡ଼ାହାଣ ପାଖ"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(ଅବୈଧ)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "ଚତୁଃ ପାର୍ଶ୍ୱ 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "ଚତୁଃ ପାର୍ଶ୍ୱ 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "ଚତୁଃ ପାର୍ଶ୍ୱ 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "ଚତୁଃ ପାର୍ଶ୍ୱ 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "ଚତୁଃ ପାର୍ଶ୍ୱ 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() ବିଫଳ ହୋଇଛି: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "କୁକି ତଥ୍ୟକୁ ବିଶ୍ଳେଷଣ କରିବାରେ ବିଫଳ"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "ଅଜଣା ଅନୁଲଗ୍ନ '%s' ପାଇଁ ସନ୍ଦେଶ ଗ୍ରହଣ କରିଅଛି"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "ନିବେଶ"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "ଶୂନ୍ୟ ଫଳାଫଳ"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(ଅବୈଧ)"
+
+#: src/pulsecore/core-util.c:1790
+#, 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 ""
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr ""
+
+#: src/pulsecore/core-util.h:97
+#, fuzzy
+msgid "no"
+msgstr "ମୋନୋ"
+
+#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "autospawn ଅପରିବର୍ତ୍ତନୀୟତାକୁ ଅଭିଗମ୍ୟ କରିହେଉ ନାହିଁ"
+
+#: src/pulsecore/log.c:165
+#, fuzzy, c-format
+msgid "Failed to open target file '%s'."
+msgstr "ଧ୍ୱନି ଫାଇଲ ଖୋଲିବାରେ ବିଫଳ।"
+
+#: src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: src/pulsecore/log.c:651
+#, fuzzy
+msgid "Invalid log target."
+msgstr "[%s:%u] ଅବୈଧ ଲଗ ଲକ୍ଷ୍ଯସ୍ଥଳ '%s'।"
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "ଆଭ୍ୟନ୍ତରୀଣ ଧ୍ୱନି"
+
+#: src/pulsecore/sink.c:3544
+msgid "Modem"
+msgstr "ମଡେମ"
+
+=======
 
 #: src/pulse/channelmap.c:157
 msgid "Top Front Left"
@@ -1592,6 +1913,7 @@ msgstr "ଆଭ୍ୟନ୍ତରୀଣ ଧ୍ୱନି"
 msgid "Modem"
 msgstr "ମଡେମ"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/error.c:38
 msgid "OK"
 msgstr "OK"
@@ -1864,7 +2186,11 @@ msgstr "ଧାରାକୁ ବାହାର କରିବାରେ ବିଫଳ 
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() ବିଫଳ ହୋଇଛି: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "ସଂଯୋଗ ବିଫଳ ହୋଇଛି: %s"
@@ -2052,7 +2378,11 @@ msgstr ""
 "libpulse %s ସହିତ ସଂକଳିତ\n"
 "libpulse %s ସହିତ ସଂଯୁକ୍ତ\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "ଅବୈଧ କ୍ଲାଏଣ୍ଟ ନାମ '%s'"
@@ -2123,7 +2453,11 @@ msgid ""
 "specification from file."
 msgstr "ଚେତାବନୀ: ଉଲ୍ଲିଖିତ ନମୁନା ବିଶେଷ ଲକ୍ଷଣକୁ ଫାଇଲରୁ ବିଶେଷ ଲକ୍ଷଣ ସହିତ ନବଲିଖନ କରାଯିବ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ଫାଇଲରୁ ନମୁନା ସୂଚନା ନିର୍ଦ୍ଧାରଣ କରିବାରେ ବିଫଳ।"
 
@@ -2158,7 +2492,11 @@ msgstr "ପଛଚଲା"
 msgid "Failed to set media name."
 msgstr "ପାଠ୍ୟ ନିର୍ଦ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିବାରେ ବିଫଳ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() ବିଫଳ ହୋଇଛି।"
 
@@ -2166,11 +2504,19 @@ msgstr "pa_mainloop_new() ବିଫଳ ହୋଇଛି।"
 msgid "io_new() failed."
 msgstr "io_new() ବିଫଳ ହୋଇଛି।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() ବିଫଳ ହୋଇଛି।"
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() ବିଫଳ ହୋଇଛି।"
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() ବିଫଳ ହୋଇଛି: %s"
@@ -2179,6 +2525,23 @@ msgstr "pa_context_connect() ବିଫଳ ହୋଇଛି: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() ବିଫଳ ହୋଇଛି।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() ବିଫଳ ହୋଇଛି।"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() ବିଫଳ ହୋଇଛି।"
@@ -2194,6 +2557,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2205,7 +2569,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2241,7 +2609,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2249,6 +2621,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2258,6 +2641,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2273,7 +2657,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2316,6 +2704,7 @@ msgstr "ସକେଟ(PF_UNIX, SOCK_STREAM, 0): %s"
 #, c-format
 msgid "connect(): %s"
 msgstr "ସଂଯୋଗ କରନ୍ତୁ(): %s"
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
@@ -2325,6 +2714,17 @@ msgstr "PulseAudio ଡେମନକୁ ବନ୍ଦ କରିବାରେ ବି
 msgid "Daemon not responding."
 msgstr "ଡେମନ ଉତ୍ତର ଦେଉନାହିଁ।"
 
+=======
+
+#: src/utils/pacmd.c:173
+msgid "Failed to kill PulseAudio daemon."
+msgstr "PulseAudio ଡେମନକୁ ବନ୍ଦ କରିବାରେ ବିଫଳ।"
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "ଡେମନ ଉତ୍ତର ଦେଉନାହିଁ।"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
@@ -2340,17 +2740,37 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "ପଢ଼ନ୍ତୁ(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "ପରିସଂଖ୍ୟାନ ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "ବର୍ତ୍ତମାନ ବ୍ୟବହାରରେ ଅଛି: %u ବ୍ଲକ ସମୁଦାୟ %s ବାଇଟ ଧାରଣ କରିଥାଏ।\n"
 msgstr[1] "ବର୍ତ୍ତମାନ ବ୍ୟବହାରରେ ଅଛି: %u ବ୍ଲକ ସମୁଦାୟ %s ବାଇଟ ଧାରଣ କରିଥାଏ।\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "ସମଗ୍ର ଜୀବନରେ ବଣ୍ଟିତ ହୋଇଥାଏ: %u ବ୍ଲକ ସମୁଦାୟ %s ବାଇଟ ଧାରଣ କରିଥାଏ।\n"
+msgstr[1] "ସମଗ୍ର ଜୀବନରେ ବଣ୍ଟିତ ହୋଇଥାଏ: %u ବ୍ଲକ ସମୁଦାୟ %s ବାଇଟ ଧାରଣ କରିଥାଏ।\n"
+
+#: src/utils/pactl.c:193
+=======
 
 #: src/utils/pactl.c:205
 #, fuzzy, c-format
@@ -2361,21 +2781,34 @@ msgstr[0] "ସମଗ୍ର ଜୀବନରେ ବଣ୍ଟିତ ହୋଇଥା
 msgstr[1] "ସମଗ୍ର ଜୀବନରେ ବଣ୍ଟିତ ହୋଇଥାଏ: %u ବ୍ଲକ ସମୁଦାୟ %s ବାଇଟ ଧାରଣ କରିଥାଏ।\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "ନମୁନା କ୍ୟାଶେ ଆକାର: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "ସର୍ଭର ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2386,7 +2819,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2409,6 +2846,21 @@ msgstr ""
 "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଉତ୍ସ: %s\n"
 "କୁକି: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2422,19 +2874,67 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "ଅଜଣା ନିର୍ଦ୍ଦେଶ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "ଲାଇନ-ଇନ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2472,17 +2972,27 @@ msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "ଏନାଲୋଗ ମୋନୋ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "ସିଙ୍କ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2521,37 +3031,66 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tସଂଯୋଗିକୀଗୁଡ଼ିକ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tସକ୍ରିୟ ସଂଯୋଗିକୀ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tସଂଯୋଗିକୀଗୁଡ଼ିକ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "ଉତ୍ସ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2590,6 +3129,17 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2599,11 +3149,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "ଏକକାଂଶ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2620,12 +3175,20 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "ଗ୍ରାହକ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2640,12 +3203,20 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "କାର୍ଡ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2662,45 +3233,77 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tରୂପରେଖଗୁଡ଼ିକ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tସକ୍ରିୟ ରୂପରେଖା: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "ସିଙ୍କ ନିବେଶ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2738,12 +3341,20 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "ଉତ୍ସ ଫଳାଫଳ ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2781,12 +3392,20 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "ନମୁନା ସୂଚନା ପାଇବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2816,21 +3435,54 @@ msgstr ""
 "\tଗୁଣଧର୍ମ:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "ବିଫଳତା: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() ବିଫଳ ହୋଇଛି: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+#, fuzzy, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "ନମୁନାକୁ ଧାରଣ କରିବାରେ ବିଫଳ: %s"
+
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2850,6 +3502,7 @@ msgid "Failed to unload module: Module %s not loaded"
 msgstr "ନମୁନାକୁ ଧାରଣ କରିବାରେ ବିଫଳ: %s"
 
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2860,11 +3513,66 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "ନମୁନାକୁ ଧାରଣ କରିବାରେ ବିଫଳ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "ଫାଇଲର ସମୟ ପୂର୍ବ ସମାପ୍ତି"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "ଫାଇଲର ସମୟ ପୂର୍ବ ସମାପ୍ତି"
@@ -2914,19 +3622,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "ଅବୈଧ ସର୍ଭର"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT ପାଇଛି, ଉତ୍ସାହିତ କରୁଅଛି।"
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "ଅବୈଧ ନମୁନା ବିଶେଷ ଲକ୍ଷଣ"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT ପାଇଛି, ଉତ୍ସାହିତ କରୁଅଛି।"
@@ -2940,15 +3672,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "ଅବୈଧ ନମୁନା ବିଶେଷ ଲକ୍ଷଣ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "ଅବୈଧ ନମୁନା ବିଶେଷ ଲକ୍ଷଣ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2994,6 +3778,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3001,7 +3786,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3022,7 +3811,11 @@ msgstr ""
 "  -s, --server=SERVER                   ସଂଯୋଗ କରିବା ପାଇଁ ସର୍ଭରର ନାମ\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3033,16 +3826,55 @@ msgstr ""
 "libpulse %s ସହିତ ସଂକଳିତ\n"
 "libpulse %s ସହିତ ସଂଯୁକ୍ତ\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "ଅବୈଧ ଧାରା ନାମ '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "ଧାରଣ କରିବା ପାଇଁ ଗୋଟିଏ ନୁମନା ଫାଇଲ ଉଲ୍ଲେଖ କରନ୍ତୁ"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "ଧ୍ୱନି ଫାଇଲ ଖୋଲିବାରେ ବିଫଳ।"
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "ଚେତାବନୀ: ଫାଇଲରୁ ନମୁନା ବିଶେଷ ଲକ୍ଷଣକୁ ନିର୍ଦ୍ଧାରଣ କରିବାରେ ବିଫଳ।"
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "ଚଲାଇବା ପାଇଁ ଆପଣଙ୍କୁ ଗୋଟିଏ ନମୁନା ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "କାଢ଼ିବା ପାଇଁ ଆପଣଙ୍କୁ ଗୋଟିଏ ନମୁନା ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା ଏବଂ ଗୋଟିଏ ସିଙ୍କ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନିର୍ଗମ ଅନୁକ୍ରମଣିକା ଏବଂ ଗୋଟିଏ ଉତ୍ସ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଏକକାଂଶ ନାମ ଏବଂ ସ୍ୱତନ୍ତ୍ରଚରଗୁଡ଼ିକୁ ଉଲ୍ଲେଖ କରିବା ଉଚିତ।"
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "ଧାରଣ କରିବା ପାଇଁ ଗୋଟିଏ ନୁମନା ଫାଇଲ ଉଲ୍ଲେଖ କରନ୍ତୁ"
@@ -3076,28 +3908,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଏକକାଂଶ ନାମ ଏବଂ ସ୍ୱତନ୍ତ୍ରଚରଗୁଡ଼ିକୁ ଉଲ୍ଲେଖ କରିବା ଉଚିତ।"
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଏକକାଂଶ ଅନୁକ୍ରମଣିକାକୁ ଉଲ୍ଲେଖ କରିବା ଉଚିତ ନୁହଁ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "ଆପଣଙ୍କୁ ଗୋଟିଏରୁ ଅଧିକ ସିଙ୍କ ଉଲ୍ଲେଖ କରିବାକୁ ପଡ଼ିନପାରେ। ଆପଣଙ୍କୁ ଗୋଟିଏ ବୁଲିଆନ ମୂଲ୍ୟ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "ଅବୈଧ ନମୁନା ବିଶେଷ ଲକ୍ଷଣ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "ଆପଣଙ୍କୁ ଗୋଟିଏରୁ ଅଧିକ ଉତ୍ସ ଉଲ୍ଲେଖ କରିବାକୁ ପଡ଼ିନପାରେ। ଆପଣଙ୍କୁ ଗୋଟିଏ ବୁଲିଆନ ମୂଲ୍ୟ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ କାର୍ଡ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ରୂପରେଖା ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ କାର୍ଡ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ରୂପରେଖା ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
@@ -3107,33 +3963,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "ଚଲାଇବା ପାଇଁ ଆପଣଙ୍କୁ ଗୋଟିଏ ନମୁନା ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଏକକାଂଶ ଅନୁକ୍ରମଣିକାକୁ ଉଲ୍ଲେଖ କରିବା ଉଚିତ ନୁହଁ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "ଚଲାଇବା ପାଇଁ ଆପଣଙ୍କୁ ଗୋଟିଏ ନମୁନା ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଏକକାଂଶ ଅନୁକ୍ରମଣିକାକୁ ଉଲ୍ଲେଖ କରିବା ଉଚିତ ନୁହଁ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା ଏବଂ ଗୋଟିଏ ସିଙ୍କ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "ଅବୈଧ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
@@ -3147,83 +4039,141 @@ msgid "Invalid sink input index"
 msgstr "ଅବୈଧ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନିର୍ଗମ ଅନୁକ୍ରମଣିକା ଏବଂ ଗୋଟିଏ ଉତ୍ସ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "ଅବୈଧ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "ଅବୈଧ ନମୁନା ବିଶେଷ ଲକ୍ଷଣ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା ଏବଂ ଗୋଟିଏ ସିଙ୍କ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "ଅବୈଧ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା ବିଶେଷ ଲକ୍ଷଣ"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "ଅବୈଧ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା ବିଶେଷ ଲକ୍ଷଣ"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ଉତ୍ସ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "ଅବୈଧ ସିଙ୍କ ନିବେଶ ଅନୁକ୍ରମଣିକା ବିଶେଷ ଲକ୍ଷଣ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ ସିଙ୍କ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ସଂଯୋଗିକୀ ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "ଆପଣଙ୍କୁ ଗୋଟିଏ କାର୍ଡ ନାମ/ଅନୁକ୍ରମଣିକା ଏବଂ ରୂପରେଖା ନାମ ଉଲ୍ଲେଖ କରିବାକୁ ହେବ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "କୌଣସି ବୈଧ ନିର୍ଦ୍ଦେଶ ଉଲ୍ଲେଖ କରାଯାଇନାହିଁ।"
 
diff --git a/po/pa.po b/po/pa.po
index c861f250a..33615b3af 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,7 +11,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.pa\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:55+0000\n"
 "Last-Translator: Jaswinder Singh <jsingh@redhat.com>\n"
 "Language-Team: Punjabi/Panjabi <kde-i18n-doc@kde.org>\n"
@@ -172,10 +176,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail ਨੂੰ ਬੁਲੀਅਨ ਆਰਗੂਮੈਂਟ ਦੀ ਲੋੜ ਹੈ"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level ਨੂੰ ਲਾਗ ਲੈਵਲ ਆਰਗੂਮੈਂਟ ਦੀ ਲੋੜ ਹੈ (ਜਾਂ ਤਾਂ ਅੰਕੀ ਰੇਂਜ 0..4 ਜਾਂ debug, info, "
 "notice, warn, error ਵਿੱਚੋਂ ਇੱਕ)।"
@@ -588,7 +598,11 @@ msgid "Line In"
 msgstr "ਲਾਈਨ-ਇਨ"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "ਮਾਈਕਰੋਫੋਨ"
 
@@ -611,12 +625,20 @@ msgid "Internal Microphone"
 msgstr "ਅੰਦਰੂਨੀ ਮਾਈਕਰੋਫੋਨ"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "ਰੇਡੀਓ"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "ਵੀਡੀਓ"
 
@@ -655,12 +677,20 @@ msgid "No Bass Boost"
 msgstr "ਕੋਈ ਬੂਸਟ ਨਹੀਂ"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "ਐਨਾਲਾਗ ਹੈੱਡਫੋਨ"
 
@@ -727,6 +757,7 @@ msgstr ""
 #, fuzzy
 msgid "Multichannel Output"
 msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:2818
 #, fuzzy
@@ -777,12 +808,68 @@ msgstr "ਐਨਾਲਾਗ ਸਟੀਰੀਓ"
 msgid "Mono"
 msgstr "ਮੋਨੋ"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:2818
+#, fuzzy
+msgid "Game Output"
+msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "ਇੰਪੁੱਟ"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "ਐਨਾਲਾਗ ਸਰਾਊਂਡ 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "ਐਨਾਲਾਗ ਮੋਨੋ"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "ਐਨਾਲਾਗ ਮੋਨੋ"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "ਐਨਾਲਾਗ ਮੋਨੋ"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "ਐਨਾਲਾਗ ਸਟੀਰੀਓ"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "ਮੋਨੋ"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
 msgid "Stereo"
 msgstr "ਸਟੀਰੀਓ"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -899,7 +986,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "ਬੰਦ"
 
@@ -913,7 +1004,11 @@ msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
 msgid "%s Input"
 msgstr "ਇੰਪੁੱਟ"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -930,7 +1025,11 @@ msgstr ""
 "We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
 "returned 0 or another value < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1015,6 +1114,16 @@ msgstr[1] ""
 "snd_pcm_mmap_begin() ਤੋਂ ਇੱਕ ਮੁੱਲ ਮਿਲਿਆ ਹੈ, ਜੋ ਬਹੁਤ ਵੱਡਾ ਹੈ: %lu ਬਾਈਟ (%lu ms)।\n"
 "ਇਹ ALSA ਡਰਾਈਵਰ '%s' ਵਿਚਲਾ ਬੱਗ ਲੱਗਦਾ ਹੈ। ਇਸ ਮੁੱਦੇ ਦੀ ALSA ਡਿਵੈਲਪਰਾਂ ਨੂੰ ਰਿਪੋਰਟ ਦਿਓ ਜੀ।"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1023,19 +1132,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "ਐਨਾਲਾਗ ਆਉਟਪੁੱਟ"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "ਐਨਾਲਾਗ ਹੈੱਡਫੋਨ"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1053,15 +1190,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "ਹਾਈ ਫਡੈਲਿਟੀ ਪਲੇਅਬੈਕ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "ਹਾਈ ਫਡੈਲਿਟੀ ਪਲੇਅਬੈਕ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1075,6 +1232,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1135,8 +1293,13 @@ msgstr ""
 "plugin name> label=<ladspa plugin label> control=<comma separated list of "
 "input control values>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1172,11 +1335,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "ਕਲਾਕਡ NULL ਸਿੰਕ"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "ਸਰੋਤ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
@@ -1199,14 +1370,24 @@ msgstr "@HOSTNAME@ ਉੱਪਰ ਆਡੀਓ"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1238,7 +1419,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ ਕੋਡ"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1441,6 +1626,77 @@ msgstr "ਉੱਤੇ ਪਿੱਛੇ ਸੈਂਟਰ"
 #: src/pulse/channelmap.c:161
 msgid "Top Rear Left"
 msgstr "ਉੱਤੇ ਪਿੱਛੇ ਖੱਬੇ"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "ਉੱਤੇ ਪਿੱਛੇ ਸੱਜੇ"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(ਅਢੁੱਕਵਾਂ)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "ਸਰਾਊਂਡਿੰਗ 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "ਸਰਾਊਂਡਿੰਗ 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "ਸਰਾਊਂਡਿੰਗ 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "ਸਰਾਊਂਡਿੰਗ 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "ਸਰਾਊਂਡਿੰਗ 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() ਫੇਲ੍ਹ ਹੈ: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "ਕੂਕੀ ਡਾਟਾ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਫੇਲ੍ਹ"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "ਅਣਜਾਣੀ ਇਕਸਟੈਂਸ਼ਨ '%s' ਲਈ ਸੁਨੇਹਾ ਮਿਲਿਆ ਹੈ"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "ਇੰਪੁੱਟ"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
+
+=======
 
 #: src/pulse/channelmap.c:162
 msgid "Top Rear Right"
@@ -1511,6 +1767,7 @@ msgstr "ਇੰਪੁੱਟ"
 msgid "output"
 msgstr "ਜ਼ੀਰੋ (Null) ਆਉਟਪੁੱਟ"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/direction.c:41
 msgid "bidirectional"
 msgstr ""
@@ -1557,11 +1814,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] ਗਲਤ ਲਾਗ ਟਾਰਗੇਟ '%s'।"
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "ਅੰਦਰੂਨੀ ਆਡੀਓ"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "ਅੰਦਰੂਨੀ ਆਡੀਓ"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "ਮਾਡਮ"
 
@@ -1837,7 +2102,11 @@ msgstr "ਸਟਰੀਮ ਡਰੇਨ ਫੇਲ੍ਹ ਹੋਇਆ: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() ਫੇਲ੍ਹ ਹੈ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ: %s"
@@ -2031,7 +2300,11 @@ msgstr ""
 "libpulse %s ਦੇ ਕੰਪਾਇਲ\n"
 "libpulse %s ਨਾਲ ਲਿੰਕ ਕੀਤਾ\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "ਅਢੁੱਕਵਾਂ ਚੈਨਲ ਮੈਪ '%s'"
@@ -2102,7 +2375,11 @@ msgid ""
 "specification from file."
 msgstr "ਇੱਕ %s ਸਟਰੀਮ ਨੂੰ ਸੈਂਪਲ ਹਦਾਇਤ '%s' ਨਾਲ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "ਸੈਂਪਲ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
 
@@ -2137,7 +2414,11 @@ msgstr "ਪਲੇਅਬੈਕ"
 msgid "Failed to set media name."
 msgstr "ਕਮਾਂਡ ਲਾਈਨ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਫੇਲ੍ਹ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() ਫੇਲ੍ਹ ਹੈ।"
 
@@ -2145,11 +2426,19 @@ msgstr "pa_mainloop_new() ਫੇਲ੍ਹ ਹੈ।"
 msgid "io_new() failed."
 msgstr "io_new() ਫੇਲ੍ਹ ਹੈ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() ਫੇਲ੍ਹ ਹੈ।"
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() ਫੇਲ੍ਹ ਹੈ।"
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() ਫੇਲ੍ਹ ਹੈ: %s"
@@ -2158,6 +2447,23 @@ msgstr "pa_context_connect() ਫੇਲ੍ਹ ਹੈ: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_new() ਫੇਲ੍ਹ ਹੈ।"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() ਫੇਲ੍ਹ ਹੈ।"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() ਫੇਲ੍ਹ ਹੈ।"
@@ -2173,6 +2479,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2184,7 +2491,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2220,7 +2531,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2228,6 +2543,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2237,6 +2563,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2252,7 +2579,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2300,11 +2631,19 @@ msgstr "connect(): %s"
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
 msgstr "ਪਲਸਆਡੀਓ ਡੈਮਨ ਬੰਦ ਕਰਨ ਵਿੱਚ ਫੇਲ।"
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:181
 msgid "Daemon not responding."
 msgstr "ਡੈਮਨ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ।"
 
+=======
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "ਡੈਮਨ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ।"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
@@ -2320,19 +2659,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "ਅੰਕੜੇ ਪ੍ਰਾਪਤੀ ਫੇਲ੍ਹ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "ਹੁਣ ਵਰਤੋਂ ਵਿੱਚ ਹੈ: %u ਬਲਾਕ ਵਿੱਚ ਕੁੱਲ %s ਬਾਈਟ ਹਨ।\n"
 msgstr[1] "ਹੁਣ ਵਰਤੋਂ ਵਿੱਚ ਹੈ: %u ਬਲਾਕ ਵਿੱਚ ਕੁੱਲ %s ਬਾਈਟ ਹਨ।\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2340,22 +2691,38 @@ msgid_plural ""
 msgstr[0] "ਪੂਰੇ ਲਾਈਫਟਾਈਮ ਵਿੱਚ ਜਾਰੀ ਕੀਤਾ ਗਿਆ: %u ਬਲਾਕ ਵਿੱਚ ਕੁੱਲ %s ਬਾਈਟ ਹਨ।\n"
 msgstr[1] "ਪੂਰੇ ਲਾਈਫਟਾਈਮ ਵਿੱਚ ਜਾਰੀ ਕੀਤਾ ਗਿਆ: %u ਬਲਾਕ ਵਿੱਚ ਕੁੱਲ %s ਬਾਈਟ ਹਨ।\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "ਸੈਂਪਲ ਕੈਸ਼ ਸਾਈਜ਼: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਫੇਲ ਹੋਇਆ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2366,7 +2733,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2389,6 +2760,21 @@ msgstr ""
 "Default Source: %s\n"
 "Cookie: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2402,19 +2788,67 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "ਲਾਈਨ-ਇਨ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2452,17 +2886,27 @@ msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "ਐਨਾਲਾਗ ਮੋਨੋ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "ਸਿੰਕ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ੍ਹ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2501,37 +2945,66 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tਪੋਰਟ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tਸਰਗਰਮ ਪੋਰਟ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tਪੋਰਟ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "ਸਰੋਤ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2570,6 +3043,17 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "ਉਪਲੱਬਧ ਨਹੀਂ"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2579,11 +3063,16 @@ msgid "n/a"
 msgstr "ਉਪਲੱਬਧ ਨਹੀਂ"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "ਮੋਡੀਊਲ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2600,12 +3089,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "ਕਲਾਇਟ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2620,12 +3117,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "ਕਾਰਡ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2642,45 +3147,77 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tਪਰੋਫਾਈਲ:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tਸਰਗਰਮ ਪਰੋਫਾਈਲ: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "ਇੰਪੁੱਟ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ੍ਹ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2718,12 +3255,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "ਸਰੋਤ ਆਉਟਪੁੱਟ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2761,12 +3306,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "ਸੈਂਪਲ ਜਾਣਕਾਰੀ ਲੈਣ ਵਿੱਚ ਫੇਲ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2796,21 +3349,65 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "ਫੇਲ੍ਹ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() ਫੇਲ੍ਹ ਹੈ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+#, fuzzy, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "ਸੈਂਪਲ ਅੱਪਲੋਡ ਕਰਨ ਵਿੱਚ ਫੇਲ: %s"
+
+#: src/utils/pactl.c:1051
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channel, whereas "
+"channel(s) supported = %d\n"
+msgid_plural ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel(s) supported = %d\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2841,10 +3438,62 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "ਸੈਂਪਲ ਅੱਪਲੋਡ ਕਰਨ ਵਿੱਚ ਫੇਲ: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "ਫਾਇਲ ਦਾ ਸਮੇਂ ਤੋਂ ਪਹਿਲਾਂ ਅੰਤ"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "ਫਾਇਲ ਦਾ ਸਮੇਂ ਤੋਂ ਪਹਿਲਾਂ ਅੰਤ"
@@ -2894,19 +3543,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "ਅਢੁੱਕਵਾਂ ਸਰਵਰ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT ਮਿਲਿਆ, ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT ਮਿਲਿਆ, ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
@@ -2920,15 +3593,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2974,6 +3699,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2981,7 +3707,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3003,7 +3733,11 @@ msgstr ""
 "to\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3014,16 +3748,55 @@ msgstr ""
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "ਅਢੁੱਕਵਾਂ ਰੀਸੈਂਪਲ ਢੰਗ '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "ਲੋਡ ਕਰਨ ਲਈ ਸੈਂਪਲ ਫਾਇਲ ਦਿਓ"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "ਸਾਊਂਡ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "ਇੱਕ %s ਸਟਰੀਮ ਨੂੰ ਸੈਂਪਲ ਹਦਾਇਤ '%s' ਨਾਲ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ।"
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "ਖੇਡਣ ਲਈ ਤੁਹਾਨੂੰ ਸੈਂਪਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "ਹਟਾਉਣ ਲਈ ਤੁਹਾਨੂੰ ਸੈਂਪਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "ਤੁਹਾਨੂੰ ਇੰਪੁੱਟ ਲਿਸਟ ਅਤੇ ਇੱਕ ਸਿੰਕ ਨੂੰ ਸਿੰਕ ਕਰਨਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਸਰੋਤ ਆਉਟਪੁੱਟ ਲਿਸਟ ਅਤੇ ਇੱਕ ਸਰੋਤ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਮੋਡੀਊਲ ਨਾਂ ਅਤੇ ਆਰਗੂਮੈਂਟ ਦੇਣਾ ਪਵੇਗਾ।"
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "ਲੋਡ ਕਰਨ ਲਈ ਸੈਂਪਲ ਫਾਇਲ ਦਿਓ"
@@ -3057,26 +3830,50 @@ msgid "You have to specify a module name and arguments."
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਮੋਡੀਊਲ ਨਾਂ ਅਤੇ ਆਰਗੂਮੈਂਟ ਦੇਣਾ ਪਵੇਗਾ।"
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਮੈਡੀਊਲ ਲਿਸਟ ਦੇਣੀ ਪਵੇਗੀ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਤੋਂ ਵੱਧ ਸਿੰਕ ਨਹੀਂ ਦੇ ਸਕਦੇ। ਤੁਹਾਨੂੰ ਇੱਕ ਬੁਲੀਅਨ ਮੁੱਲ ਦੇਣਾ ਪਵੇਗਾ।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਤੋਂ ਵੱਧ ਸਰੋਤ ਨਹੀਂ ਦੇ ਸਕਦੇ। ਤੁਹਾਨੂੰ ਬੁਲੀਅਨ ਮੁੱਲ ਦੇਣਾ ਪਵੇਗਾ।"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
@@ -3086,33 +3883,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "ਖੇਡਣ ਲਈ ਤੁਹਾਨੂੰ ਸੈਂਪਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਮੈਡੀਊਲ ਲਿਸਟ ਦੇਣੀ ਪਵੇਗੀ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "ਖੇਡਣ ਲਈ ਤੁਹਾਨੂੰ ਸੈਂਪਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਮੈਡੀਊਲ ਲਿਸਟ ਦੇਣੀ ਪਵੇਗੀ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "ਤੁਹਾਨੂੰ ਇੰਪੁੱਟ ਲਿਸਟ ਅਤੇ ਇੱਕ ਸਿੰਕ ਨੂੰ ਸਿੰਕ ਕਰਨਾ ਪਵੇਗਾ"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "ਅਢੁੱਕਵੀਂ ਸਿੰਕ ਇੰਪੁੱਟ ਸੂਚੀ"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
@@ -3126,83 +3959,141 @@ msgid "Invalid sink input index"
 msgstr "ਅਢੁੱਕਵੀਂ ਸਿੰਕ ਇੰਪੁੱਟ ਸੂਚੀ"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਸਰੋਤ ਆਉਟਪੁੱਟ ਲਿਸਟ ਅਤੇ ਇੱਕ ਸਰੋਤ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "ਅਢੁੱਕਵੀਂ ਸਿੰਕ ਇੰਪੁੱਟ ਸੂਚੀ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "ਤੁਹਾਨੂੰ ਇੰਪੁੱਟ ਲਿਸਟ ਅਤੇ ਇੱਕ ਸਿੰਕ ਨੂੰ ਸਿੰਕ ਕਰਨਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "ਅਢੁੱਕਵਾਂ ਸੈਂਪਲ ਹਦਾਇਤ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਕਾਰਡ ਨਾਂ/ਲਿਸਟ ਅਤੇ ਪਰੋਫਾਈਲ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "ਕੋਈ ਯੋਗ ਕਮਾਂਡ ਨਹੀਂ ਦਿੱਤੀ।"
 
diff --git a/po/pl.po b/po/pl.po
index afa812abe..b2fe880eb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,13 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-03-09 15:55+0000\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-05-21 10:06+0000\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/pl/>\n"
@@ -19,7 +24,11 @@ msgstr ""
 "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"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.5.1\n"
+=======
 "X-Generator: Weblate 4.12.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -604,7 +613,11 @@ msgid "Line In"
 msgstr "Wejście liniowe"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -625,12 +638,20 @@ msgid "Internal Microphone"
 msgstr "Wewnętrzny mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Wideo"
 
@@ -667,12 +688,20 @@ msgid "No Bass Boost"
 msgstr "Brak podbicia basów"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Głośnik"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Słuchawki"
 
@@ -780,7 +809,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Słuchawki z mikrofonem"
 
@@ -893,7 +926,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Rozmowa mono + przestrzenne 7.1"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Wyłączone"
 
@@ -907,7 +944,11 @@ msgstr "Wyjście %s"
 msgid "%s Input"
 msgstr "Wejście %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -924,7 +965,11 @@ msgstr ""
 "Wybudzono za pomocą ustawienia POLLOUT — ale jednoczesne wywołanie "
 "snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1029,6 +1074,64 @@ msgstr[2] ""
 "Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
 "programistom usługi ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Wejście Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Wyjście Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Zestaw głośnomówiący"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Słuchawki"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Przenośne"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Samochód"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Odtwarzanie o wysokiej dokładności (odpływ A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Przechwytywanie o wysokiej dokładności (źródło A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Jednostka główna słuchawek z mikrofonem (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Zestaw słuchawek z mikrofonem (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Jednostka główna zestawu głośnomówiącego (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1085,6 +1188,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Jednostka główna zestawu głośnomówiącego (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Zestaw głośnomówiący (HFP)"
 
@@ -1192,11 +1296,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Zegarowy PUSTY odpływ"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Puste wyjście"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Puste wyjście"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Ustawienie formatu się nie powiodło: nieprawidłowy ciąg formatu %s"
@@ -1219,14 +1331,24 @@ msgstr "Dźwięk na @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunel dla %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunel do %s/%s"
@@ -1258,7 +1380,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Nieznany model urządzenia"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Standardowy profil RAOP"
 
@@ -1576,11 +1702,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Nieprawidłowy dziennik docelowy."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Wbudowany dźwięk"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Wbudowany dźwięk"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1855,7 +1989,11 @@ msgstr "Ustawienie potoku monitora się nie powiodło: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Połączenie się nie powiodło: %s"
@@ -2067,7 +2205,11 @@ msgstr ""
 "Skompilowane za pomocą libpulse %s\n"
 "Skonsolidowane za pomocą libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nieprawidłowa nazwa klienta „%s”"
@@ -2140,7 +2282,11 @@ msgstr ""
 "Ostrzeżenie: podane określenie próbki zostanie zastąpione przez określenie "
 "z pliku."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Ustalenie określenia próbki z pliku nie się nie powiodło."
 
@@ -2175,7 +2321,11 @@ msgstr "odtwarzanie"
 msgid "Failed to set media name."
 msgstr "Ustawienie nazwy nośnika się nie powiodło."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() się nie powiodło."
 
@@ -2183,11 +2333,19 @@ msgstr "pa_mainloop_new() się nie powiodło."
 msgid "io_new() failed."
 msgstr "io_new() się nie powiodło."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() się nie powiodło."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() się nie powiodło."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() się nie powiodło: %s"
@@ -2196,6 +2354,23 @@ msgstr "pa_context_connect() się nie powiodło: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() się nie powiodło."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() się nie powiodło."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAZWA [PARAMETRY…]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAZWA|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() się nie powiodło."
@@ -2211,6 +2386,7 @@ msgstr "NAZWA|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAZWA"
 
@@ -2222,7 +2398,11 @@ msgstr "NAZWA|#N GŁOŚNOŚĆ"
 msgid "#N VOLUME"
 msgstr "#N GŁOŚNOŚĆ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAZWA|#N 1|0"
 
@@ -2258,7 +2438,11 @@ msgstr "NAZWA-ŚCIEŻKI"
 msgid "FILENAME SINK|#N"
 msgstr "NAZWA-PLIKU ODPŁYW|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N ODPŁYW|ŹRÓDŁO"
 
@@ -2266,6 +2450,17 @@ msgstr "#N ODPŁYW|ŹRÓDŁO"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PROFIL KARTY"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAZWA|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PROFIL KARTY"
@@ -2275,6 +2470,7 @@ msgid "NAME|#N PORT"
 msgstr "NAZWA|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NAZWA-KARTY|KARTA-#N PORT OFFSET"
 
@@ -2290,7 +2486,11 @@ msgstr "POZIOM-NUMERYCZNY"
 msgid "FRAMES"
 msgstr "RAMKI"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "ODBIORCA KOMUNIKAT [PARAMETRY_KOMUNIKATU]"
 
@@ -2358,12 +2558,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Uzyskanie statystyk się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2371,7 +2579,11 @@ msgstr[0] "Obecnie używane: %u blok zawierający %s B.\n"
 msgstr[1] "Obecnie używane: %u bloki zawierające razem %s B.\n"
 msgstr[2] "Obecnie używane: %u bloków zawierających razem %s B.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2385,22 +2597,39 @@ msgstr[2] ""
 "Przydzielono podczas całego czasu uruchomienia: %u bloków zawierających "
 "razem %s B.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Rozmiar pamięci podręcznej próbek: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Uzyskanie informacji o serwerze się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2417,7 +2646,11 @@ msgstr ""
 "Indeks klienta: %u\n"
 "Rozmiar kafla: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2440,6 +2673,74 @@ msgstr ""
 "Domyślne źródło: %s\n"
 "Ciasteczko: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "dostępność jest nieznana"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "dostępne"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "niedostępne"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Pomocniczy"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Liniowy"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mikrofon"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Słuchawka telefonu"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Słuchawka douszna"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "S/PDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "Telewizor"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Sieć"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analogowe"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "dostępność jest nieznana"
@@ -2506,11 +2807,16 @@ msgstr "Analogowe"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Uzyskanie informacji o odpływie się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2549,37 +2855,66 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorty:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (typ: %s, priorytet: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", grupa dostępności: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", grupa dostępności: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktywny port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormaty:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Uzyskanie informacji o źródle się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2618,6 +2953,17 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "nie dotyczy"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2627,11 +2973,16 @@ msgid "n/a"
 msgstr "nie dotyczy"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Uzyskanie informacji o module się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2648,12 +2999,20 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Uzyskanie informacji o kliencie się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2668,12 +3027,20 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Uzyskanie informacji o karcie się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2690,22 +3057,38 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfile:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (odpływy: %u, źródła: %u, priorytet: %u, dostępne: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktywny profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
@@ -2713,7 +3096,11 @@ msgstr ""
 "\t\t%s: %s (typ: %s, priorytet: %u, offset opóźnienia: %<PRId64> us%s%s, "
 "%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2722,17 +3109,29 @@ msgstr ""
 "\t\t\tWłaściwości:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tCzęść profilu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Uzyskanie informacji o odpływie wejścia się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2771,12 +3170,20 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Uzyskanie informacji o wyjściu źródła się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2815,12 +3222,20 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Uzyskanie informacji o próbce się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2849,21 +3264,50 @@ msgstr ""
 "\tWłaściwości:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Niepowodzenie: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Komunikat wysłania się nie powiódł: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr "Komunikat „list-handlers” się nie powiódł: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr "Nie można poprawnie przetworzyć odpowiedzi komunikatu „list-handlers”"
+
+#: src/utils/pactl.c:951
+#, fuzzy
+msgid "list-handlers message response is not a JSON array"
+msgstr "Nie można poprawnie przetworzyć odpowiedzi komunikatu „list-handlers”"
+
+#: src/utils/pactl.c:962
+#, fuzzy, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr "Nie można poprawnie przetworzyć odpowiedzi komunikatu „list-handlers”"
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr "nie można poprawnie przetworzyć odpowiedzi komunikatu „list-handlers”"
@@ -2880,12 +3324,17 @@ msgstr ""
 "JSON"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, 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"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2903,11 +3352,74 @@ msgstr[2] ""
 "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"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Wysłanie próbki się nie powiodło: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Przedwczesny koniec pliku"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nowy"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "zmień"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "usuń"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "nieznany"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "odpływ"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "źródło"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "wejście-odpływu"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "wyjście-źródła"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "moduł"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klient"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "bufor-próbki"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "serwer"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "karta"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Przedwczesny koniec pliku"
@@ -2965,10 +3477,78 @@ msgid "card"
 msgstr "karta"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Zdarzenie „%s” w %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Otrzymano SIGINT, kończenie działania."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Nieprawidłowe określenie głośności"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Głośność jest poza dozwolonym zakresem.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Nieprawidłowa liczba określeń głośności.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Niespójne określenie głośności.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opcje]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYP]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NAZWA-PLIKU [NAZWA]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAZWA [ODPŁYW]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAZWA|#N GŁOŚNOŚĆ [GŁOŚNOŚĆ…]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N GŁOŚNOŚĆ [GŁOŚNOŚĆ…]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAZWA|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATY"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Otrzymano SIGINT, kończenie działania."
@@ -3034,6 +3614,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATY"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3044,7 +3625,11 @@ msgstr ""
 "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"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3066,7 +3651,11 @@ msgstr ""
 "  -s, --server=SERWER                   Nazwa serwera do połączenia się\n"
 "  -n, --client-name=NAZWA               Jak nazwać tego klienta w serwerze\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3077,16 +3666,59 @@ msgstr ""
 "Skompilowane za pomocą libpulse %s\n"
 "Skonsolidowane za pomocą libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Nieprawidłowa wartość formatu „%s”"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Należy podać nic lub jedno z: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Proszę podać plik próbki do wczytania"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Otwarcie pliku dźwiękowego się nie powiodło."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Ostrzeżenie: ustalenie określenia próbki z pliku się nie powiodło."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Należy podać nazwę próbki do odtworzenia"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Należy podać nazwę próbki do usunięcia"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Należy podać indeks odpływu wejścia i odpływ"
+
+#: src/utils/pactl.c:2042
+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"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Należy podać nazwę modułu i parametry."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Należy podać indeks lub nazwę modułu"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Proszę podać plik próbki do wczytania"
@@ -3124,22 +3756,88 @@ msgid "You have to specify a module index or name"
 msgstr "Należy podać indeks lub nazwę modułu"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 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ą."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Nieprawidłowe określenie wstrzymania."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Nieprawidłowe określenie wstrzymania."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 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ą."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Należy podać nazwę karty/indeks i nazwę profilu"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Należy podać nazwę odpływu/indeks i nazwę portu"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Należy podać nazwę odpływu"
+
+#: src/utils/pactl.c:2162
+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"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Należy podać nazwę źródła"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Należy podać nazwę odpływu"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Należy podać nazwę odpływu/indeks i głośność"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Należy podać nazwę źródła"
+
+#: src/utils/pactl.c:2219
+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ść"
+
+#: src/utils/pactl.c:2232
+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ść"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Nieprawidłowy indeks odpływ wejścia"
+
+#: src/utils/pactl.c:2248
+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ść"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Nieprawidłowy indeks wejścia źródła"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Należy podać nazwę karty/indeks i nazwę profilu"
@@ -3193,34 +3891,56 @@ msgid "Invalid source output index"
 msgstr "Nieprawidłowy indeks wejścia źródła"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Należy podać nazwę odpływu/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Nieprawidłowe określenie wyciszenia"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Nieprawidłowe określenie wyciszenia"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Należy podać nazwę źródła/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Należy podać indeks odpływu wejścia i działanie wyciszenia (0, 1 lub "
 "„toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Nieprawidłowe określenie indeksu odpływu wejścia"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Nieprawidłowe określenie indeksu odpływu wejścia"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3228,6 +3948,17 @@ msgstr ""
 "Należy podać nazwę indeks wyjścia źródła i działanie wyciszenia (0, 1 lub "
 "„toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Nieprawidłowe określenie indeksu wyjścia źródła"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "Należy podać co najmniej ścieżkę do obiektu i nazwę komunikatu"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Nieprawidłowe określenie indeksu wyjścia źródła"
@@ -3237,6 +3968,7 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Należy podać co najmniej ścieżkę do obiektu i nazwę komunikatu"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
@@ -3244,7 +3976,11 @@ msgstr ""
 "Podano nadmiarowe parametry, które zostaną zignorowane. Proszę pamiętać, że "
 "wszystkie parametry komunikatu muszą być podawane jako jeden ciąg."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3252,6 +3988,17 @@ msgstr ""
 "Należy podać nazwę indeks odpływu listę obsługiwanych formatów oddzielonych "
 "średnikami"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+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"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Nie można przetworzyć offsetu opóźnienia"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 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"
@@ -3261,6 +4008,7 @@ msgid "Could not parse latency offset"
 msgstr "Nie można przetworzyć offsetu opóźnienia"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Nie podano prawidłowego polecenia."
 
diff --git a/po/pt.po b/po/pt.po
index 755144866..6bc85751d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,11 +9,18 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2020-09-19 04:27+0100\n"
+"Last-Translator: Juliano de Souza Camargo <julianosc@pm.me>\n"
+"Language-Team: Portuguese <>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-08-15 14:19+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/pt/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,9 +29,15 @@ msgstr ""
 "X-Generator: Weblate 4.13\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: PORTUGAL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Gtranslator 3.36.0\n"
 
 #: src/daemon/cmdline.c:113
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "\n"
@@ -93,6 +106,854 @@ msgid ""
 "                                        after startup\n"
 "\n"
 "  -n                                    Don't load default script file\n"
+<<<<<<< HEAD
+msgstr ""
+"%s [opções]\n"
+"\n"
+"COMANDOS:\n"
+"  -h, --help                            Mostra esta ajuda\n"
+"      --version                         Mostra a versão\n"
+"      --dump-conf                       Despeja configuração predefinida\n"
+"      --dump-modules                    Despeja a lista de módulos "
+"disponíveis\n"
+"      --dump-resample-methods           Despeja oa métodos de reamostragem "
+"disponíveis\n"
+"      --cleanup-shm                     Limpa segmentos de memória "
+"partilhados encravados\n"
+"      --start                           Inicia o serviço, se ainda não "
+"estiver a executar\n"
+"  -k  --kill                            Termina o serviço, se estiver a "
+"executar \n"
+"      --check                           Verifica se o serviço está a "
+"executar (só retorna um código de saída)\n"
+"\n"
+"OPÇÕES:\n"
+"      --system[=BOOL]                   Executa em modo de sistema\n"
+"  -D, --daemonize[=BOOL]                Passa a serviço depois de executar\n"
+"      --fail[=BOOL]                     Termina quando o arranque falha\n"
+"      --high-priority[=BOOL]            Tenta definir um alto nível de "
+"execução\n"
+"                                        (só disponível como root, quando é "
+"SUID ou\n"
+"                                        com níveis elevados de RLIMIT_NICE)\n"
+"      --realtime[=BOOL]                 Tenta ativar escalonamento em tempo "
+"real\n"
+"                                        (só disponível como root, quando é "
+"SUID ou\n"
+"                                        com níveis elevados de "
+"RLIMIT_RTPRIO)\n"
+"      --disallow-module-loading[=BOOL]  Desautoriza o carregamento/"
+"descarregamento\n"
+"                                        de módulos, pelo utilizador, depois "
+"do arranque\n"
+"      --disallow-exit[=BOOL]            Desautoriza pedidos de saída do "
+"utilizador\n"
+"      --exit-idle-time=SECS             Termina o serviço quando inativo e "
+"já passou\n"
+"                                        este tempo\n"
+"      --scache-idle-time=SECS           Descarrega amostras de carregamento "
+"automático quando inativas e\n"
+"                                        passou este tempo\n"
+"      --log-level[=LEVEL]               Aumenta ou define o nível de "
+"verbosidade\n"
+"  -v                                    Aumenta o nível de verbosidade\n"
+"      --log-target={auto,syslog,stderr} Especifica o ficheiro de registo\n"
+"      --log-meta[=BOOL]                 Inclui código de localização na "
+"mensagem de registo\n"
+"      --log-time[=BOOL]                 Inclui tempo na mensagem de registo\n"
+"      --log-backtrace=FRAMES            Inclui informação de rastreio na "
+"mensagem de registo\n"
+"  -p, --dl-search-path=PATH             Define o caminho de procura para os "
+"plugins partilhados dinâmicos\n"
+"      --resample-method=METHOD          Utilizar o método de reamostragem "
+"especificado\n"
+"                                        (Ver --dump-resample-methods para\n"
+"                                        possíveis valores)\n"
+"      --use-pid-file[=BOOL]             Criar um ficheiro com o PID\n"
+"      --no-cpu-limit[=BOOL]             Não instala limitadores de load no "
+"CPU em\n"
+"                                        plataformas que o suportam.\n"
+"      --disable-shm[=BOOL]              Desativa suporte para memória "
+"partilhada.\n"
+"\n"
+"SCRIPT DE ARRANQUE:\n"
+"  -L, --load=\"MODULE ARGUMENTS\"         Carrega o módulo especificado com\n"
+"                                        o argumento especificado\n"
+"  -F, --file=FILENAME                   Executa o script especificado\n"
+"  -C                                    Abre uma linha de comando no TTY "
+"(terminal) em execução\n"
+"                                        depois do arranque\n"
+"\n"
+"  -n                                    Não carrega o predefinido script\n"
+
+#: src/daemon/cmdline.c:246
+msgid "--daemonize expects boolean argument"
+msgstr "--daemonize espera argumento booleano"
+
+#: src/daemon/cmdline.c:254
+msgid "--fail expects boolean argument"
+msgstr "--fail espera argumento booleano"
+
+#: src/daemon/cmdline.c:265
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+msgstr ""
+"--log-level espera um argumento para o nível de log (numérico no intervalo "
+"0..4 ou um dos seguintes: debug, info, notice, warn, error)."
+
+#: src/daemon/cmdline.c:277
+msgid "--high-priority expects boolean argument"
+msgstr "--high-priority espera argumento booleano"
+
+#: src/daemon/cmdline.c:285
+msgid "--realtime expects boolean argument"
+msgstr "--realtime espera argumento booleano"
+
+#: src/daemon/cmdline.c:293
+msgid "--disallow-module-loading expects boolean argument"
+msgstr "--disallow-module-loading espera argumento booleano"
+
+#: src/daemon/cmdline.c:301
+msgid "--disallow-exit expects boolean argument"
+msgstr "--disallow-exit espera argumento booleano"
+
+#: src/daemon/cmdline.c:309
+msgid "--use-pid-file expects boolean argument"
+msgstr "--use-pid-file espera argumento booleano"
+
+#: src/daemon/cmdline.c:328
+#, fuzzy
+msgid ""
+"Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Destino de ficheiro de registo inválido: utilize 'syslog', 'stderr', 'auto' "
+"ou um nome de ficheiro válido 'file:<path>'."
+
+#: src/daemon/cmdline.c:330
+#, fuzzy
+msgid ""
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
+"name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Destino de ficheiro de registo inválido: utilize 'syslog', 'stderr', 'auto' "
+"ou um nome de ficheiro válido 'file:<path>'."
+
+#: src/daemon/cmdline.c:338
+msgid "--log-time expects boolean argument"
+msgstr "--log-time espera argumento booleano"
+
+#: src/daemon/cmdline.c:346
+msgid "--log-meta expects boolean argument"
+msgstr "--log-meta espera argumento booleano"
+
+#: src/daemon/cmdline.c:366
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr "Método de resample inválido '%s'."
+
+#: src/daemon/cmdline.c:373
+msgid "--system expects boolean argument"
+msgstr "--system espera argumento booleano"
+
+#: src/daemon/cmdline.c:381
+msgid "--no-cpu-limit expects boolean argument"
+msgstr "--no-cpu-limit espera argumento booleano"
+
+#: src/daemon/cmdline.c:389
+msgid "--disable-shm expects boolean argument"
+msgstr "--disable-shm espera argumento booleano"
+
+#: src/daemon/cmdline.c:397
+#, fuzzy
+msgid "--enable-memfd expects boolean argument"
+msgstr "--realtime espera argumento booleano"
+
+#: src/daemon/daemon-conf.c:270
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] ficheiro registo de destino inválido '%s'."
+
+#: src/daemon/daemon-conf.c:285
+#, c-format
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] Nível do ficheiro de registo inválido '%s'."
+
+#: src/daemon/daemon-conf.c:300
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] Método de reamostragem inválido '%s'."
+
+#: src/daemon/daemon-conf.c:322
+#, c-format
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] rlimit inválido '%s'."
+
+#: src/daemon/daemon-conf.c:342
+#, c-format
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr "[%s:%u] Formato da amostra inválido '%s'."
+
+#: src/daemon/daemon-conf.c:359 src/daemon/daemon-conf.c:376
+#, c-format
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr "[%s:%u] Taxa de amostragem '%s' inválida."
+
+#: src/daemon/daemon-conf.c:399
+#, c-format
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr "[%s:%u] Canais de amostragem inválidos '%s'."
+
+#: src/daemon/daemon-conf.c:416
+#, c-format
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr "[%s:%u] Mapa de canais inválido '%s'."
+
+#: src/daemon/daemon-conf.c:433
+#, c-format
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr "[%s:%u] Número inválido de fragmentos '%s'."
+
+#: src/daemon/daemon-conf.c:450
+#, c-format
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr "[%s:%u] Tamanho do fragmento inválido '%s'."
+
+#: src/daemon/daemon-conf.c:467
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr "[%s:%u] nível nice inválido '%s'."
+
+#: src/daemon/daemon-conf.c:552
+#, c-format
+msgid "[%s:%u] Invalid server type '%s'."
+msgstr "[%s:%u] Tipo de servidor \"%s\" inválido."
+
+#: src/daemon/daemon-conf.c:685
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr "Falha ao abrir ficheiro de configuração: %s"
+
+#: src/daemon/daemon-conf.c:701
+msgid ""
+"The specified default channel map has a different number of channels than "
+"the specified default number of channels."
+msgstr ""
+"O mapa de canais especificado tem um número de canais diferente do número de "
+"canais definido por omissão."
+
+#: src/daemon/daemon-conf.c:788
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr "### Ler configuração a partir do ficheiro: %s ###\n"
+
+#: src/daemon/dumpmodules.c:57
+#, c-format
+msgid "Name: %s\n"
+msgstr "Nome: %s\n"
+
+#: src/daemon/dumpmodules.c:60
+#, c-format
+msgid "No module information available\n"
+msgstr "Nenhuma informação de módulo disponível\n"
+
+#: src/daemon/dumpmodules.c:63
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versão: %s\n"
+
+#: src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Description: %s\n"
+msgstr "Descrição: %s\n"
+
+#: src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
+
+#: src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Utilização: %s\n"
+
+#: src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Carregar Uma Vez: %s\n"
+
+#: src/daemon/dumpmodules.c:72
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "AVISO DE DESCONTINUIDADE: %s\n"
+
+#: src/daemon/dumpmodules.c:76
+#, c-format
+msgid "Path: %s\n"
+msgstr "Caminho: %s\n"
+
+#: src/daemon/ltdl-bind-now.c:75
+#, fuzzy, c-format
+msgid "Failed to open module %s: %s"
+msgstr "Falha ao abrir o ficheiro '%s'\n"
+
+#: src/daemon/ltdl-bind-now.c:126
+msgid "Failed to find original lt_dlopen loader."
+msgstr "Não foi possível encontrar o carregador \"lt_dlopen\"."
+
+#: src/daemon/ltdl-bind-now.c:131
+msgid "Failed to allocate new dl loader."
+msgstr "Não foi possível alocar o novo carregador \"dl\"."
+
+#: src/daemon/ltdl-bind-now.c:144
+msgid "Failed to add bind-now-loader."
+msgstr "Não foi possível adicionar \"bind-now-loader\"."
+
+#: src/daemon/main.c:265
+#, c-format
+msgid "Failed to find user '%s'."
+msgstr "Falha ao procurar o utilizador '%s'."
+
+#: src/daemon/main.c:270
+#, c-format
+msgid "Failed to find group '%s'."
+msgstr "Falha ao procurar o grupo '%s'."
+
+#: src/daemon/main.c:279
+#, c-format
+msgid "GID of user '%s' and of group '%s' don't match."
+msgstr "GID do utilizador '%s' e do grupo '%s' não coincidem."
+
+#: src/daemon/main.c:284
+#, c-format
+msgid "Home directory of user '%s' is not '%s', ignoring."
+msgstr "Directório pessoal do utilizador '%s' não é '%s'. A ignorar."
+
+#: src/daemon/main.c:287 src/daemon/main.c:292
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "Falha ao criar o '%s': %s"
+
+#: src/daemon/main.c:299
+#, c-format
+msgid "Failed to change group list: %s"
+msgstr "Falhou a alteração da lista de grupos: %s"
+
+#: src/daemon/main.c:315
+#, c-format
+msgid "Failed to change GID: %s"
+msgstr "Não foi possível mudar o GID: %s"
+
+#: src/daemon/main.c:331
+#, c-format
+msgid "Failed to change UID: %s"
+msgstr "Não foi possível mudar o UID: %s"
+
+#: src/daemon/main.c:360
+msgid "System wide mode unsupported on this platform."
+msgstr "Modo de sistema não suportado nesta plataforma."
+
+#: src/daemon/main.c:650
+msgid "Failed to parse command line."
+msgstr "Não foi possível processar linha de comando."
+
+#: src/daemon/main.c:689
+msgid ""
+"System mode refused for non-root user. Only starting the D-Bus server lookup "
+"service."
+msgstr ""
+"Modo de sistema recusado por utilizador não raiz. A iniciar só serviço de "
+"procura do servidor D-Bus."
+
+#: src/daemon/main.c:788
+#, c-format
+msgid "Failed to kill daemon: %s"
+msgstr "Tentativa de matar serviço falhou: %s"
+
+#: src/daemon/main.c:817
+msgid ""
+"This program is not intended to be run as root (unless --system is "
+"specified)."
+msgstr ""
+"Este programa não pretende ser executado como root (a não ser que a opção --"
+"system seja especificada)."
+
+#: src/daemon/main.c:820
+msgid "Root privileges required."
+msgstr "São necessários privilégios de root."
+
+#: src/daemon/main.c:827
+msgid "--start not supported for system instances."
+msgstr "--start não é suportado para instâncias do sistema."
+
+#: src/daemon/main.c:867
+#, c-format
+msgid "User-configured server at %s, refusing to start/autospawn."
+msgstr ""
+"Servidor configurado pelo utilizador em %s, a recusar iniciar/autogerar."
+
+#: src/daemon/main.c:873
+#, c-format
+msgid ""
+"User-configured server at %s, which appears to be local. Probing deeper."
+msgstr ""
+"Servidor configurado pelo utilizador em %s, que aparenta ser local. A testar "
+"mais."
+
+#: src/daemon/main.c:878
+#, fuzzy
+msgid "Running in system mode, but --disallow-exit not set."
+msgstr "A executar em modo de sistema, mas --disallow-exit não está definido!"
+
+#: src/daemon/main.c:881
+#, fuzzy
+msgid "Running in system mode, but --disallow-module-loading not set."
+msgstr ""
+"A executar em modo de sistema, mas --disallow-module-loading não está "
+"definido!"
+
+#: src/daemon/main.c:884
+#, fuzzy
+msgid "Running in system mode, forcibly disabling SHM mode."
+msgstr "A executar em modo de sistema, a forçar a desactivação do modo SHM!"
+
+#: src/daemon/main.c:889
+#, fuzzy
+msgid "Running in system mode, forcibly disabling exit idle time."
+msgstr ""
+"A executar em modo de sistema, a forçar a desactivação da saída por "
+"inactividade!"
+
+#: src/daemon/main.c:922
+msgid "Failed to acquire stdio."
+msgstr "Não foi possível adquirir o stdio."
+
+#: src/daemon/main.c:928 src/daemon/main.c:999
+#, c-format
+msgid "pipe() failed: %s"
+msgstr "pipe() falhou: %s"
+
+#: src/daemon/main.c:933 src/daemon/main.c:1004
+#, c-format
+msgid "fork() failed: %s"
+msgstr "fork() falhou: %s"
+
+#: src/daemon/main.c:948 src/daemon/main.c:1019 src/utils/pacat.c:562
+#, c-format
+msgid "read() failed: %s"
+msgstr "read() falhou: %s"
+
+#: src/daemon/main.c:954
+msgid "Daemon startup failed."
+msgstr "Arranque do serviço falhou."
+
+#: src/daemon/main.c:987
+#, c-format
+msgid "setsid() failed: %s"
+msgstr "setsid() falhou: %s"
+
+#: src/daemon/main.c:1119
+msgid "Failed to get machine ID"
+msgstr "A tentativa de ler o ID da máquina falhou"
+
+#: src/daemon/main.c:1145
+#, fuzzy
+msgid ""
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\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, 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://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:1161
+msgid "pa_pid_file_create() failed."
+msgstr "pa_pid_file_create() falhou."
+
+#: src/daemon/main.c:1193
+msgid "pa_core_new() failed."
+msgstr "pa_core_new() falhou."
+
+#: src/daemon/main.c:1268
+#, fuzzy
+msgid "command line arguments"
+msgstr "Demasiados argumentos."
+
+#: src/daemon/main.c:1275
+#, c-format
+msgid ""
+"Failed to initialize daemon due to errors while executing startup commands. "
+"Source of commands: %s"
+msgstr ""
+
+#: src/daemon/main.c:1280
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr "Serviço arrancou sem módulos carregados. A recusar trabalhar."
+
+#: src/daemon/pulseaudio.desktop.in:4
+msgid "PulseAudio Sound System"
+msgstr "Sistema de Som PulseAudio"
+
+#: src/daemon/pulseaudio.desktop.in:5
+msgid "Start the PulseAudio Sound System"
+msgstr "Inciar o Sistema de Som PulseAudio"
+
+#: src/modules/alsa/alsa-mixer.c:2708
+msgid "Input"
+msgstr "Entrada"
+
+#: src/modules/alsa/alsa-mixer.c:2709
+msgid "Docking Station Input"
+msgstr "Entrada da estação de ancoragem"
+
+#: src/modules/alsa/alsa-mixer.c:2710
+msgid "Docking Station Microphone"
+msgstr "Microfone da estação de ancoração"
+
+#: src/modules/alsa/alsa-mixer.c:2711
+msgid "Docking Station Line In"
+msgstr "Linha de entrada da estação de ancoração"
+
+#: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
+msgid "Line In"
+msgstr "Linha de entrada"
+
+#: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+msgid "Microphone"
+msgstr "Microfone"
+
+#: src/modules/alsa/alsa-mixer.c:2714 src/modules/alsa/alsa-mixer.c:2798
+msgid "Front Microphone"
+msgstr "Microfone frontal"
+
+#: src/modules/alsa/alsa-mixer.c:2715 src/modules/alsa/alsa-mixer.c:2799
+msgid "Rear Microphone"
+msgstr "Microfone externo"
+
+#: src/modules/alsa/alsa-mixer.c:2716
+msgid "External Microphone"
+msgstr "Microfone externo"
+
+#: src/modules/alsa/alsa-mixer.c:2717 src/modules/alsa/alsa-mixer.c:2801
+msgid "Internal Microphone"
+msgstr "Microfone interno"
+
+#: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+#: src/utils/pactl.c:295
+msgid "Radio"
+msgstr "Rádio"
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:296
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/modules/alsa/alsa-mixer.c:2720
+msgid "Automatic Gain Control"
+msgstr "Controlo automático de ganho"
+
+#: src/modules/alsa/alsa-mixer.c:2721
+msgid "No Automatic Gain Control"
+msgstr "Sem controlo automático de ganho"
+
+#: src/modules/alsa/alsa-mixer.c:2722
+msgid "Boost"
+msgstr "Aumentar"
+
+#: src/modules/alsa/alsa-mixer.c:2723
+msgid "No Boost"
+msgstr "Não aumentar"
+
+#: src/modules/alsa/alsa-mixer.c:2724
+msgid "Amplifier"
+msgstr "Amplificador"
+
+#: src/modules/alsa/alsa-mixer.c:2725
+msgid "No Amplifier"
+msgstr "Sem amplificador"
+
+#: src/modules/alsa/alsa-mixer.c:2726
+msgid "Bass Boost"
+msgstr "Aumentar graves"
+
+#: src/modules/alsa/alsa-mixer.c:2727
+msgid "No Bass Boost"
+msgstr "Não aumentar graves"
+
+#: src/modules/alsa/alsa-mixer.c:2728
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+msgid "Speaker"
+msgstr "Coluna"
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:286
+msgid "Headphones"
+msgstr "Auscultadores"
+
+#: src/modules/alsa/alsa-mixer.c:2796
+msgid "Analog Input"
+msgstr "Entrada analógica"
+
+#: src/modules/alsa/alsa-mixer.c:2800
+msgid "Dock Microphone"
+msgstr "Microfone da âncora"
+
+#: src/modules/alsa/alsa-mixer.c:2802
+#, fuzzy
+msgid "Headset Microphone"
+msgstr "Microfone externo"
+
+#: src/modules/alsa/alsa-mixer.c:2806
+msgid "Analog Output"
+msgstr "Saída analógica"
+
+#: src/modules/alsa/alsa-mixer.c:2808
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Auscultadores"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+#, fuzzy
+msgid "Headphones Mono Output"
+msgstr "Saída mono analógica"
+
+#: src/modules/alsa/alsa-mixer.c:2810
+msgid "Line Out"
+msgstr "Linha de saída"
+
+#: src/modules/alsa/alsa-mixer.c:2811
+msgid "Analog Mono Output"
+msgstr "Saída mono analógica"
+
+#: src/modules/alsa/alsa-mixer.c:2812
+msgid "Speakers"
+msgstr "Colunas"
+
+#: src/modules/alsa/alsa-mixer.c:2813
+msgid "HDMI / DisplayPort"
+msgstr "HDMI/DisplayPort"
+
+#: src/modules/alsa/alsa-mixer.c:2814
+msgid "Digital Output (S/PDIF)"
+msgstr "Saída digital (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2815
+#, fuzzy
+msgid "Digital Input (S/PDIF)"
+msgstr "Saída digital (S/PDIF)"
+
+#: src/modules/alsa/alsa-mixer.c:2816
+msgid "Multichannel Input"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2817
+#, fuzzy
+msgid "Multichannel Output"
+msgstr "Saída nula"
+
+#: src/modules/alsa/alsa-mixer.c:2818
+#, fuzzy
+msgid "Game Output"
+msgstr "Saída %s"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "Saída %s"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "Entrada %s"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Surround 7.1 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4563
+msgid "Analog Mono"
+msgstr "Mono Analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4564
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Mono Analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Mono Analógico"
+
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: src/modules/alsa/alsa-mixer.c:4566 src/modules/alsa/alsa-mixer.c:4574
+#: src/modules/alsa/alsa-mixer.c:4575
+msgid "Analog Stereo"
+msgstr "Estéreo Analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4567 src/pulse/channelmap.c:103
+#: src/pulse/channelmap.c:770
+msgid "Mono"
+msgstr "Mono"
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+#, fuzzy
+msgid "Speakerphone"
+msgstr "Coluna"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "Surround 2.1 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "Surround 3.0 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "Surround 3.1 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "Surround 4.0 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "Surround 4.1 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "Surround 5.0 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "Surround 5.1 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "Surround 6.0 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "Surround 6.1 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "Surround 7.0 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "Surround 7.1 analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "Estéreo Digital (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Surround Digital 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Surround Digital 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+#, fuzzy
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Surround Digital 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "Estéreo Digital (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Surround 5.1 (IEC958/AC3) digital"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "Mono duplex analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4733
+msgid "Analog Stereo Duplex"
+msgstr "Estéreo duplex analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4736
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "Estéreo duplex digital (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4738
+#, fuzzy
+msgid "Stereo Duplex"
+msgstr "Estéreo duplex analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+msgid "Off"
+msgstr "Desligado"
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, c-format
+msgid "%s Output"
+msgstr "Saída %s"
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, c-format
+msgid "%s Input"
+msgstr "Entrada %s"
+
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+#, fuzzy, 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 ""
 "%s [opções]\n"
 "\n"
@@ -184,10 +1045,351 @@ msgstr "--fail espera argumento booleano"
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
-"--log-level espera um argumento para o nível de log (numérico no intervalo "
-"0..4 ou um dos seguintes: debug, info, notice, warn, error)."
+"ALSA acordou-nos para escrever novos dados para o dispositivo, mas não havia "
+"nada para escrever!\n"
+"Provavelmente isto é um erro no driver ALSA '%s'. Por favor, reporte este "
+"problema aos programadores do ALSA.\n"
+"Fomos acordados pelo conjunto POLLOUT -- contudo uma chamada a seguir de "
+"snd_pcm_avail() retornou 0 ou outro valor < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, fuzzy, 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 ""
+"ALSA acordou-nos para ler novos dados do dispositivo, mas não havia nada "
+"para ler!\n"
+"Provavelmente isto é um erro no driver ALSA '%s'. Por favor, reporte este "
+"problema aos programadores do ALSA.\n"
+"Fomos acordados pelo conjunto POLLIN -- contudo uma chamada a seguir de "
+"snd_pcm_avail() retornou 0 ou outro valor < min_avail."
+
+#: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_avail() retornou um valor excecionalmente elevado: %lu bytes (%lu "
+"ms).\n"
+"Provavelmente isto é um erro no controlador ALSA \"%s\". Por favor, reporte "
+"este problema aos programadores do ALSA."
+msgstr[1] ""
+"snd_pcm_avail() retornou um valor excecionalmente elevado: %lu bytes (%lu "
+"ms).\n"
+"Provavelmente isto é um erro no controlador ALSA \"%s\". Por favor, reporte "
+"este problema aos programadores do ALSA."
+
+#: src/modules/alsa/alsa-util.c:1249
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() retornou um valor excecionalmente elevado: %li bytes (%s%lu "
+"ms).\n"
+"Provavelmente isto é um erro no driver ALSA '%s'. Por favor, reporte este "
+"problema aos programadores do ALSA."
+msgstr[1] ""
+"snd_pcm_delay() retornou um valor excecionalmente elevado: %li bytes (%s%lu "
+"ms).\n"
+"Provavelmente isto é um erro no driver ALSA '%s'. Por favor, reporte este "
+"problema aos programadores do ALSA."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, 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 ""
+"snd_pcm_avail_delay() retornou um valor excecionalmente elevado: %lu bytes "
+"(%lu ms).\n"
+"Provavelmente isto é um erro no controlador ALSA \"%s\". Por favor, reporte "
+"este problema aos programadores do ALSA."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() retornou um valor excecionalmente elevado: %lu bytes "
+"(%lu ms).\n"
+"Provavelmente isto é um erro no driver ALSA '%s'. Por favor, reporte este "
+"problema aos programadores do ALSA."
+msgstr[1] ""
+"snd_pcm_mmap_begin() retornou um valor excecionalmente elevado: %lu bytes "
+"(%lu ms).\n"
+"Provavelmente isto é um erro no driver ALSA '%s'. Por favor, reporte este "
+"problema aos programadores do ALSA."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+#, fuzzy
+msgid "Bluetooth Output"
+msgstr "Saída analógica"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+#, fuzzy
+msgid "Handsfree"
+msgstr "Mãos livres Gateway"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+#, fuzzy
+msgid "Headphone"
+msgstr "Auscultadores"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+#, fuzzy
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reprodução Alta Fidelidade (A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+#, fuzzy
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Captação de Alta Fidelidade (A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr ""
+
+#: src/modules/echo-cancel/module-echo-cancel.c:59
+#, fuzzy
+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> use_master_format=<yes "
+"or no> "
+msgstr ""
+"source_name=<nome da origem> source_properties=<propriedades da origem> "
+"source_master=<nome da origem a filtrar> sink_name=<nome do deposito> "
+"sink_properties=<propriedades do deposito> sink_master=<nome do deposito a "
+"filtrar> adjust_time=<quantas vezes ajustar taxas em s> "
+"adjust_threshold=<quanto desvio reajustar a seguir em ms> format=<formato da "
+"amostra> rate=<frequência da amostra> channels=<número de canais> "
+"channel_map=<mapa de canais> aec_method=<implementacao a usar> "
+"aec_args=<parametros para o motor AEC> save_aec=<gravar dados AEC em /tmp> "
+"autoloaded=<marcar se este modulo for carregado automaticamente> "
+"use_volume_sharing=<sim ou nao> "
+
+#. add on profile
+#: src/modules/macosx/module-coreaudio-device.c:825
+msgid "On"
+msgstr ""
+
+#: src/modules/module-allow-passthrough.c:71
+#: src/modules/module-always-sink.c:80
+msgid "Dummy Output"
+msgstr "Saída Dummy"
+
+#: src/modules/module-always-sink.c:34
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr "Mantém sempre pelo menos um depósito carregado mesmo que seja um nulo"
+
+#: src/modules/module-always-source.c:35
+#, fuzzy
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr "Mantém sempre pelo menos um depósito carregado mesmo que seja um nulo"
+
+#: src/modules/module-equalizer-sink.c:68
+msgid "General Purpose Equalizer"
+msgstr "Equalizador de uso geral"
+
+#: src/modules/module-equalizer-sink.c:72
+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=<nome do deposito> sink_properties=<propriedades do deposito> "
+"sink_master=<nome do deposito a ligar> format=<formato da amostra> "
+"rate=<frequencia de amostragem> channels=<numero de canais> "
+"channel_map=<mapa de canais> autoloaded=<define se este módulo há de ser "
+"cargado automaticamente> use_volume_sharing=<sim ou nao> "
+"force_flat_volume=<sim ou nao> "
+
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr ""
+
+#: src/modules/module-filter-apply.c:47
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr "autoclean=<descarregar automaticamente filtros nao usados?>"
+
+#: src/modules/module-ladspa-sink.c:50
+msgid "Virtual LADSPA sink"
+msgstr "Depósito virtual LADSPA"
+
+#: src/modules/module-ladspa-sink.c:54
+#, fuzzy
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"sink_input_properties=<properties for the sink input> master=<name of sink "
+"to filter> 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> autoloaded=<set if this module "
+"is being loaded automatically> "
+msgstr ""
+"sink_name=<nome do deposito> sink_properties=<propriedades do deposito> "
+"master=<nome do deposito a filtrar> format=<formato exemplo> "
+"rate=<frequência de amostragem> channels=<numero de canais> "
+"channel_map=<mapa de canais> plugin=<nome da extensao ladspa> "
+"label=<etiqueta do plugin ladspa> control=<Lista de valores de controlo de "
+"entrada separados por virgulas>"
+
+#: src/modules/module-null-sink.c:46
+msgid "Clocked NULL sink"
+msgstr "Depósito de relógio NULL"
+
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Saída nula"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+#, c-format
+msgid "Failed to set format: invalid format string %s"
+msgstr "Falha ao definir formato: cadeia %s com formato inválido"
+
+#: src/modules/module-rygel-media-server.c:506
+#: src/modules/module-rygel-media-server.c:544
+#: src/modules/module-rygel-media-server.c:903
+msgid "Output Devices"
+msgstr "Dispositivos de saída"
+
+#: src/modules/module-rygel-media-server.c:507
+#: src/modules/module-rygel-media-server.c:545
+#: src/modules/module-rygel-media-server.c:904
+msgid "Input Devices"
+msgstr "Dispositivos de entrada"
+
+#: src/modules/module-rygel-media-server.c:1061
+msgid "Audio on @HOSTNAME@"
+msgstr "Áudio no @HOSTNAME@"
+
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+#, c-format
+msgid "Tunnel for %s@%s"
+msgstr ""
+
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+#, c-format
+msgid "Tunnel to %s/%s"
+msgstr ""
+
+#: src/modules/module-virtual-surround-sink.c:50
+#, fuzzy
+msgid "Virtual surround sink"
+msgstr "Depósito virtual LADSPA"
+
+#: src/modules/module-virtual-surround-sink.c:54
+#, fuzzy
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> 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 hrir_left=/path/to/"
+"left_hrir.wav hrir_right=/path/to/optional/right_hrir.wav autoloaded=<set if "
+"this module is being loaded automatically> "
+msgstr ""
+"sink_name=<nome do deposito> sink_properties=<propriedades do deposito> "
+"sink_master=<nome do deposito a ligar> format=<formato da amostra> "
+"rate=<frequencia de amostragem> channels=<numero de canais> "
+"channel_map=<mapa de canais> autoloaded=<define se este módulo há de ser "
+"cargado automaticamente> use_volume_sharing=<sim ou nao> "
+"force_flat_volume=<sim ou nao> "
+
+#: src/modules/raop/module-raop-discover.c:295
+#, fuzzy
+msgid "Unknown device model"
+msgstr "Código de erro desconhecido"
+
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+=======
 #: src/daemon/cmdline.c:277
 msgid "--high-priority expects boolean argument"
 msgstr "--high-priority espera argumento booleano"
@@ -1252,6 +2454,7 @@ msgstr "Código de erro desconhecido"
 msgid "RAOP standard profile"
 msgstr "Perfil padrão RAOP"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
 msgstr "Servidor de Som PulseAudio"
@@ -1459,7 +2662,10 @@ msgstr "Topo Traseira Direita"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(inválido)"
 
@@ -1511,6 +2717,25 @@ msgid "Received message for unknown extension '%s'"
 msgstr "Recebida mensagem para extensão desconhecida '%s'"
 
 #: src/pulse/direction.c:37
+<<<<<<< HEAD
+#, fuzzy
+msgid "input"
+msgstr "Entrada"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "Saída %s"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(inválido)"
+=======
 msgid "input"
 msgstr "entrada"
 
@@ -1525,6 +2750,7 @@ msgstr "bidirecional"
 #: src/pulse/direction.c:43
 msgid "invalid"
 msgstr "inválido"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulsecore/core-util.c:1790
 #, c-format
@@ -1533,6 +2759,17 @@ 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 ""
+<<<<<<< HEAD
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr ""
+
+#: src/pulsecore/core-util.h:97
+#, fuzzy
+msgid "no"
+msgstr "Mono"
+=======
 "XDG_RUNTIME_DIR (%s) não é de nossa propriedade (uid %d), mas pela uid %d! ("
 "Isso pode, por exemplo, acontecer se você tentar se conectar a um PulseAudio "
 "não raiz como um usuário raiz, sobre o protocolo nativo. Não faça isso.)"
@@ -1544,21 +2781,41 @@ msgstr "sim"
 #: src/pulsecore/core-util.h:97
 msgid "no"
 msgstr "não"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
 msgid "Cannot access autospawn lock."
 msgstr "Impossível aceder ao lock \"autospawn\"."
 
 #: src/pulsecore/log.c:165
+<<<<<<< HEAD
+#, fuzzy, c-format
+msgid "Failed to open target file '%s'."
+msgstr "Falha ao abrir o ficheiro '%s'\n"
+=======
 #, c-format
 msgid "Failed to open target file '%s'."
 msgstr "Falha ao abrir o ficheiro alvo '%s'."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulsecore/log.c:188
 #, c-format
 msgid ""
 "Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/pulsecore/log.c:651
+#, fuzzy
+msgid "Invalid log target."
+msgstr "[%s:%u] ficheiro registo de destino inválido '%s'."
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Áudio Interno"
+
+#: src/pulsecore/sink.c:3544
+=======
 "Tentou abrir o arquivo de alvo '%s', '%s.1', '%s.2' ... \"%s.%d' mas todos "
 "falharam."
 
@@ -1571,6 +2828,7 @@ msgid "Built-in Audio"
 msgstr "Áudio Interno"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1611,6 +2869,10 @@ msgid "Timeout"
 msgstr "Tempo expirou"
 
 #: src/pulse/error.c:47
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No authentication key"
 msgstr "Sem chave de autorização"
 
@@ -1700,7 +2962,11 @@ msgstr "%0.1f MiB"
 #: src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
+<<<<<<< HEAD
+msgstr "%.1f KiB"
+=======
 msgstr "%0.1f KiB"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/pulse/sample.c:197
 #, c-format
@@ -1760,7 +3026,11 @@ msgid "Using sample spec '%s', channel map '%s'."
 msgstr "Utilizando especificação da amostra '%s', mapa de canal '%s'."
 
 #: src/utils/pacat.c:342
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Connected to device %s (index: %u, suspended: %s)."
 msgstr "Ligado ao dispositivo %s (%u, %ssuspended)."
 
@@ -1817,8 +3087,14 @@ msgid "Cork request stack is empty: uncorking stream"
 msgstr "Pilha de pedidos de rolha vazia: a remover rolha do fluxo"
 
 #: src/utils/pacat.c:425
+<<<<<<< HEAD
+#, fuzzy
+msgid "Warning: Received more uncork requests than cork requests."
+msgstr "Aviso: recebidos mais pedidos de remover rolha do que de rolhar!"
+=======
 msgid "Warning: Received more uncork requests than cork requests."
 msgstr "Aviso: recebidos mais pedidos de incork do que de cork."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:450
 #, c-format
@@ -1836,7 +3112,11 @@ msgid "pa_stream_connect_playback() failed: %s"
 msgstr "pa_stream_connect_playback() falhou: %s"
 
 #: src/utils/pacat.c:497
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to set monitor stream: %s"
 msgstr "Falha ao esvaziar fluxo: %s"
 
@@ -1845,7 +3125,11 @@ msgstr "Falha ao esvaziar fluxo: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() falhou: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Ligação falhou: %s"
@@ -1884,7 +3168,11 @@ msgid "pa_stream_update_timing_info() failed: %s"
 msgstr "pa_stream_update_timing_info() falhou: %s"
 
 #: src/utils/pacat.c:676
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "%s\n"
@@ -1968,8 +3256,13 @@ msgstr ""
 "      --stream-name=NAME                Como chamar este fluxo no servidor\n"
 "      --volume=VOLUME                   Especificar o volume (linear) "
 "inicial na gama 0...65536\n"
+<<<<<<< HEAD
+"      --rate=SAMPLERATE                 A frequência da amostra em Hz "
+"(predefinida 44100)\n"
+=======
 "      --rate=SAMPLERATE                 A frequência da amostra em Hz ("
 "predefinida 44100)\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "      --format=SAMPLEFORMAT             Tipo de amostra, um de s16le, s16be, "
 "u8, float32le,\n"
 "                                        float32be, ulaw, alaw, s32le, s32be, "
@@ -1984,8 +3277,13 @@ msgstr ""
 "      --fix-format                      Usa o formato de amostra do depósito/"
 "origem ao qual\n"
 "                                        o fluxo está a ser ligado.\n"
+<<<<<<< HEAD
+"      --fix-rate                        Usa a frequência de amostra do "
+"depósito/origem ao qual\n"
+=======
 "      --fix-rate                        Usa a frequência de amostra do depó"
 "sito/origem ao qual\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "                                        o fluxo está a ser ligado.\n"
 "      --fix-channels                    Usa o número de canais e o mapa de "
 "canais do depósito/origem\n"
@@ -1998,8 +3296,13 @@ msgstr ""
 "bytes.\n"
 "      --process-time=BYTES              Pede o tempo de processo por pedido "
 "em bytes.\n"
+<<<<<<< HEAD
+"      --latency-msec=MSEC               Pede a latência especificada em "
+"mseg.\n"
+=======
 "      --latency-msec=MSEC               Pede a latência especificada em mseg."
 "\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "      --property=PROPERTY=VALUE         Coloca a propriedade específica com "
 "o valor especificado.\n"
 "      --raw                             Grava/Lê dados raw em PCM.\n"
@@ -2037,6 +3340,30 @@ msgstr ""
 "Reprodução de dados de áudio do STDIN ou do arquivo especificado em um "
 "servidor de som PulseAudio."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:793
+msgid "Play back encoded audio files on a PulseAudio sound server."
+msgstr ""
+
+#: src/utils/pacat.c:797
+msgid ""
+"Capture audio data from a PulseAudio sound server and write it to a file."
+msgstr ""
+
+#: src/utils/pacat.c:801
+msgid ""
+"Capture audio data from a PulseAudio sound server and write it to STDOUT or "
+"the specified file."
+msgstr ""
+
+#: src/utils/pacat.c:805
+msgid ""
+"Play back audio data from STDIN or the specified file on a PulseAudio sound "
+"server."
+msgstr ""
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacat.c:819
 #, c-format
 msgid ""
@@ -2048,7 +3375,11 @@ msgstr ""
 "Compilado com libpulse %s\n"
 "Ligado com libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nome de cliente inválido '%s'"
@@ -2085,7 +3416,11 @@ msgstr "Formato de ficheiro desconhecido %s."
 
 #: src/utils/pacat.c:1000
 msgid "Failed to parse the argument for --monitor-stream"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Falhou em analisar o argumento para -monitor-stream"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacat.c:1011
 msgid "Invalid sample specification"
@@ -2121,7 +3456,11 @@ msgstr ""
 "Aviso: a especificação da amostra será sobrescrita com a especificação do "
 "ficheiro."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Falha ao determinar a especificação da amostra a partir do ficheiro."
 
@@ -2156,7 +3495,11 @@ msgstr "reprodução"
 msgid "Failed to set media name."
 msgstr "Impossível definir nome do suporte."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() falhou."
 
@@ -2164,11 +3507,19 @@ msgstr "pa_mainloop_new() falhou."
 msgid "io_new() failed."
 msgstr "io_new() falhou."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() falhou."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() falhou."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() falhou: %s"
@@ -2177,6 +3528,24 @@ msgstr "pa_context_connect() falhou: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() falhou."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() falhou."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NOME [ARGS ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+#, fuzzy
+msgid "NAME|#N"
+msgstr "NOME|#N 1|0"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() falhou."
@@ -2192,6 +3561,7 @@ msgstr "NAME|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NOME"
 
@@ -2203,7 +3573,11 @@ msgstr "NOME|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NOME|#N 1|0"
 
@@ -2212,6 +3586,79 @@ msgid "#N 1|0"
 msgstr "#N 1|0"
 
 #: src/utils/pacmd.c:58
+<<<<<<< HEAD
+#, fuzzy
+msgid "NAME|#N KEY=VALUE"
+msgstr "NOME|#N VOLUME"
+
+#: src/utils/pacmd.c:59
+msgid "#N KEY=VALUE"
+msgstr ""
+
+#: src/utils/pacmd.c:61
+msgid "#N"
+msgstr "#N"
+
+#: src/utils/pacmd.c:62
+#, fuzzy
+msgid "NAME SINK|#N"
+msgstr "NOME [DEPÓSITO]"
+
+#: src/utils/pacmd.c:64 src/utils/pacmd.c:65
+#, fuzzy
+msgid "NAME FILENAME"
+msgstr "NOMEFICHEIRO [NOME]"
+
+#: src/utils/pacmd.c:66
+#, fuzzy
+msgid "PATHNAME"
+msgstr "NOME"
+
+#: src/utils/pacmd.c:67
+#, fuzzy
+msgid "FILENAME SINK|#N"
+msgstr "NOME [DEPÓSITO]"
+
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+msgid "#N SINK|SOURCE"
+msgstr "#N DEPÓSITO|ORIGEM"
+
+#: src/utils/pacmd.c:71 src/utils/pacmd.c:77 src/utils/pacmd.c:78
+#, fuzzy
+msgid "1|0"
+msgstr "#N 1|0"
+
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PERFIL CARTÃO"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NOME|#N PORTA"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr ""
+
+#: src/utils/pacmd.c:75
+msgid "TARGET"
+msgstr ""
+
+#: src/utils/pacmd.c:76
+msgid "NUMERIC-LEVEL"
+msgstr ""
+
+#: src/utils/pacmd.c:79
+msgid "FRAMES"
+msgstr ""
+
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+
+#: src/utils/pacmd.c:82
+#, fuzzy, c-format
+=======
 msgid "NAME|#N KEY=VALUE"
 msgstr "NAME|#N KEY=VALUE"
 
@@ -2277,6 +3724,7 @@ msgstr "MENSAGEM DO DESTINATÁRIO [MESSAGE_PARAMETERS]"
 
 #: src/utils/pacmd.c:82
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -2289,7 +3737,11 @@ msgstr ""
 "Quando nenhum comando é dado, o pacmd inicia no modo interativo.\n"
 
 #: src/utils/pacmd.c:129
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "pacmd %s\n"
 "Compiled with libpulse %s\n"
@@ -2317,15 +3769,27 @@ msgstr "connect(): %s"
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
 msgstr "Não foi possível terminar o serviço PulseAudio."
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:181
 msgid "Daemon not responding."
 msgstr "Serviço não responde."
 
+=======
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "Serviço não responde."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
 msgid "write(): %s"
 msgstr "write(): %s"
+<<<<<<< HEAD
+
+#: src/utils/pacmd.c:269
+=======
 
 #: src/utils/pacmd.c:269
 #, c-format
@@ -2338,10 +3802,32 @@ msgid "read(): %s"
 msgstr "read(): %s"
 
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+#, c-format
+msgid "poll(): %s"
+msgstr "poll(): %s"
+
+<<<<<<< HEAD
+#: src/utils/pacmd.c:280 src/utils/pacmd.c:300
+#, c-format
+msgid "read(): %s"
+msgstr "read(): %s"
+
+#: src/utils/pactl.c:175
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Falhou a obtenção de estatísticas: %s"
 
+#: src/utils/pactl.c:181
+#, fuzzy, c-format
+msgid "Currently in use: %u block containing %s bytes total.\n"
+msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
+msgstr[0] "Correntemente em uso: %u blocos contendo %s bytes no total.\n"
+msgstr[1] "Correntemente em uso: %u blocos contendo %s bytes no total.\n"
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:199
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
@@ -2351,30 +3837,52 @@ msgstr[1] "Correntemente em uso: %u blocos contendo %s bytes no total.\n"
 
 #: src/utils/pactl.c:205
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
+<<<<<<< HEAD
+"Alocado durante todo o tempo de vida: %u blocos contendo %s bytes no total.\n"
+msgstr[1] ""
+"Alocado durante todo o tempo de vida: %u blocos contendo %s bytes no total.\n"
+
+#: src/utils/pactl.c:193
+=======
 "Alocado durante todo o tempo de vida: %u bloco contendo %s bytes no total.\n"
 msgstr[1] ""
 "Alocado durante todo o tempo de vida: %u blocos contendo %s bytes no total.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Tamanho cache da amostra: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Falha ao obter informações do servidor: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2391,7 +3899,11 @@ msgstr ""
 "Índice do cliente: %u\n"
 "Tamanho do mosaico: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2414,6 +3926,77 @@ msgstr ""
 "Origem predefinida: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "desconhecido"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "Linha de entrada"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Mono Analógico"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "disponibilidade desconhecida"
@@ -2480,12 +4063,18 @@ msgstr "Analógico"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Falha ao obter informações do depósito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:664
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Sink #%u\n"
 "\tState: %s\n"
@@ -2523,11 +4112,27 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorto:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2538,23 +4143,38 @@ msgid ", availability group: "
 msgstr ", grupo de disponibilidade: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPorto Activo: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormatos:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Falha ao obter informações da fonte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:849
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Source #%u\n"
 "\tState: %s\n"
@@ -2592,6 +4212,17 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/d"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2601,11 +4232,16 @@ msgid "n/a"
 msgstr "n/d"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Falha ao obter informações do módulo: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2622,12 +4258,20 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Falha ao obter informações do cliente: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2642,12 +4286,20 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Falha ao obter informações da carta: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2664,35 +4316,66 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tPrefis:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1240
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (pias: %u, fontes: %u, prioridade: %u, disponível: %s)\n"
 
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tPerfil Activo: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (tipo: %s, prioridade: %u, deslocamento de latência: %<PRId64> "
 "usec%s%s, %s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:684
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 "\t\t\tPropriedades:\n"
 "\t\t\t\t%s\n"
 
@@ -2702,12 +4385,18 @@ msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tParte do perfil: %s"
 
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Falha ao obter informação de entrada do depósito: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:1366
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Sink Input #%u\n"
 "\tDriver: %s\n"
@@ -2745,13 +4434,22 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Falha ao obter informações da fonte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:1489
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Source Output #%u\n"
 "\tDriver: %s\n"
@@ -2789,13 +4487,22 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Falha ao obter informações da amostra: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+#, fuzzy, c-format
+=======
 #: src/utils/pactl.c:1604
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Sample #%u\n"
 "\tName: %s\n"
@@ -2824,11 +4531,57 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Falha: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "read() falhou: %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+#, fuzzy, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "Falha ao enviar amostra: %s"
+
+#: src/utils/pactl.c:1051
+#, c-format
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channel, whereas "
+"channel(s) supported = %d\n"
+msgid_plural ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel(s) supported = %d\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2878,10 +4631,70 @@ msgstr[1] ""
 "enquanto os canais (s) suportados = %d\n"
 
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Falha ao enviar amostra: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Fim prematuro do ficheiro"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "novo"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "alterar"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "remover"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "desconhecido"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "depósito"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "origem"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "sink-input"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "origem-saída"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "módulo"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "cliente"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "amostra-cache"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "servidor"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Fim prematuro do ficheiro"
@@ -2939,10 +4752,83 @@ msgid "card"
 msgstr "placa"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Evento '%s' em %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Obtido SIGINT, a sair."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Especificação de volume inválida"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volume fora do intervalo permitido.\n"
+
+#: src/utils/pactl.c:1798
+#, fuzzy
+msgid "Invalid number of volume specifications.\n"
+msgstr "Especificação de volume inválida"
+
+#: src/utils/pactl.c:1810
+#, fuzzy
+msgid "Inconsistent volume specification.\n"
+msgstr "Especificação de volume inválida"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opções]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPO]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NOMEFICHEIRO [NOME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NOME [DEPÓSITO]"
+
+#: src/utils/pactl.c:1857
+#, fuzzy
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NOME|#N VOLUME"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+#, fuzzy
+msgid "NAME|#N 1|0|toggle"
+msgstr "NOME|#N 1|0"
+
+#: src/utils/pactl.c:1860
+#, fuzzy
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATOS"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Obtido SIGINT, a sair."
@@ -3008,6 +4894,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATOS"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3018,7 +4905,11 @@ msgstr ""
 "Os nomes especiais @DEFAULT_SINK@, @DEFAULT_SOURCE@ e @DEFAULT_MONITOR@\n"
 "pode ser usado para especificar o dissipador padrão, fonte e monitor.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3035,12 +4926,23 @@ msgstr ""
 "\n"
 "  -h, --help                            Mostra esta ajuda\n"
 "      --version                         Mostra a versão\n"
+<<<<<<< HEAD
+"\n"
+"  -s, --server=SERVER                   Nome do servidor ao qual ligar\n"
+"  -n, --client-name=NAME                Como chamar este cliente no "
+"servidor\n"
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "\n"
 "  -s, --server=SERVER                   Nome do servidor ao qual ligar\n"
 "  -n, --client-name=NAME                Como chamar este cliente no "
 "servidor\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3051,16 +4953,60 @@ msgstr ""
 "Compilado com libpulse %s\n"
 "Linkado com libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Nome de fluxo inválido '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Não especifique nada ou um de: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Por favor, especifique um ficheiro de amostra para carregar"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Falha ao abrir ficheiro de som."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Aviso: Falha ao determinar a especificação da amostra do ficheiro."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Tem de especificar um nome de amostra para reproduzir"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Tem de especificar um nome de amostra para remover"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Tem de especificar um índice de entrada de depósito e um depósito"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Tem de especificar um índice de saída de fonte e uma fonte"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Tem de especificar um nome de módulo e argumentos."
+
+#: src/utils/pactl.c:2077
+#, fuzzy
+msgid "You have to specify a module index or name"
+msgstr "Tem de especificar um índice de módulo"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Por favor, especifique um ficheiro de amostra para carregar"
@@ -3098,17 +5044,27 @@ msgid "You have to specify a module index or name"
 msgstr "Tem de especificar um índice de módulo"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Não pode especificar mais do que um depósito. Tem de especificar um valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+#, fuzzy
+msgid "Invalid suspend specification."
+msgstr "Especificação de amostra inválida"
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Especificação de suspensão inválida."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3116,6 +5072,66 @@ msgstr ""
 "Não pode especificar mais do que uma fonte. Tem de especificar um valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Tem de especificar um nome/índice de placa e um nome de perfil"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Tem de especificar um nome/índice de depósito e nome de um porto"
+
+#: src/utils/pactl.c:2149
+#, fuzzy
+msgid "You have to specify a sink name"
+msgstr "Tem de especificar um nome de amostra para reproduzir"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Tem de especificar um nome/índice de fonte e nome de um porto"
+
+#: src/utils/pactl.c:2173
+#, fuzzy
+msgid "You have to specify a source name"
+msgstr "Tem de especificar um índice de módulo"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Tem de especificar um nome de amostra para reproduzir"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Tem de especificar um nome/índice de depósito e um volume"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Tem de especificar um índice de módulo"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Tem de especificar um nome/índice de fonte e um volume"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Tem de especificar um índice de entrada de depósito e um volume"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Índice de depósito de entrada inválido"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Tem de especificar um índice de saída de origem e um volume"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Índice de saída de origem inválido"
+
+#: src/utils/pactl.c:2274
+#, fuzzy
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Tem de especificar um nome/índice de placa e um nome de perfil"
@@ -3169,35 +5185,72 @@ msgid "Invalid source output index"
 msgstr "Índice de saída de origem inválido"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Tem de especificar um nome/índice de depósito e um booleano mudo"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Especificação de silêncio inválida"
+
+#: src/utils/pactl.c:2299
+#, fuzzy
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Especificação de silêncio inválida"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Tem de especificar um nome/índice de fonte e um booleano mudo"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+#, fuzzy
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "Tem de especificar um índice de entrada de depósito e um booleano mudo"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Índice de entrada de depósito inválida"
+
+#: src/utils/pactl.c:2332
+#, fuzzy
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Índice de entrada de depósito inválida"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "Tem de especificar um nome/índice de origem e um lógico mudo"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Especificação de índice de saída de origem inválida"
+
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "Tem de especificar um nome/índice de depósito e nome de um porto"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Especificação de índice de saída de origem inválida"
@@ -3207,20 +5260,404 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Tem de especificar um nome/índice de depósito e nome de um porto"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Argumentos excessivos dados, eles serão ignorados. Observe que todos os "
 "parâmetros de mensagem devem ser dados como uma única sequência."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 "Tem de especificar um nome/índice de depósito e uma lista de formatos "
 "suportados separados por ponto e vírgula"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2382
+#, fuzzy
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "Tem de especificar um nome/índice de placa e um nome de perfil"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+msgid "No valid command specified."
+msgstr "O comando especificado é inválido."
+
+#: src/utils/pasuspender.c:79
+#, c-format
+msgid "fork(): %s\n"
+msgstr "fork(): %s\n"
+
+#: src/utils/pasuspender.c:92
+#, c-format
+msgid "execvp(): %s\n"
+msgstr "execvp(): %s\n"
+
+#: src/utils/pasuspender.c:111
+#, c-format
+msgid "Failure to resume: %s\n"
+msgstr "Falhou ao restaurar: %s\n"
+
+#: src/utils/pasuspender.c:145
+#, c-format
+msgid "Failure to suspend: %s\n"
+msgstr "Falhou ao suspender: %s\n"
+
+#: src/utils/pasuspender.c:170
+#, c-format
+msgid "WARNING: Sound server is not local, not suspending.\n"
+msgstr "Atenção: Servidor de Som não local, suspender ignorado.\n"
+
+#: src/utils/pasuspender.c:183
+#, c-format
+msgid "Connection failure: %s\n"
+msgstr "Ligação falhou: %s\n"
+
+#: src/utils/pasuspender.c:201
+#, c-format
+msgid "Got SIGINT, exiting.\n"
+msgstr "Obtido SIGINT, a sair.\n"
+
+#: src/utils/pasuspender.c:219
+#, c-format
+msgid "WARNING: Child process terminated by signal %u\n"
+msgstr "Atenção: Processo filho terminado por sinal %u\n"
+
+#: src/utils/pasuspender.c:228
+#, fuzzy, c-format
+msgid ""
+"%s [options] -- PROGRAM [ARGUMENTS ...]\n"
+"\n"
+"Temporarily suspend PulseAudio while PROGRAM runs.\n"
+"\n"
+"  -h, --help                            Show this help\n"
+"      --version                         Show version\n"
+"  -s, --server=SERVER                   The name of the server to connect "
+"to\n"
+"\n"
+msgstr ""
+"%s [opções] ... \n"
+"\n"
+"  -h, --help                            Mostra esta ajuda\n"
+"      --version                         Mostra a versão\n"
+"  -s, --server=SERVER                   Nome do servidor ao qual ligar\n"
+"\n"
+
+#: src/utils/pasuspender.c:267
+#, c-format
+msgid ""
+"pasuspender %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
+"pasuspender %s\n"
+"Compilado com libpulse %s\n"
+"Ligado com libpulse %s\n"
+
+#: src/utils/pasuspender.c:296
+#, c-format
+msgid "pa_mainloop_new() failed.\n"
+msgstr "pa_mainloop_new() falhou.\n"
+
+#: src/utils/pasuspender.c:309
+#, c-format
+msgid "pa_context_new() failed.\n"
+msgstr "pa_context_new() falhou.\n"
+
+#: src/utils/pasuspender.c:321
+#, c-format
+msgid "pa_mainloop_run() failed.\n"
+msgstr "pa_mainloop_run() falhou.\n"
+
+#: src/utils/pax11publish.c:58
+#, 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 ecrã] [-S servidor] [-O depósito] [-I fonte] [-c ficheiro]  [-d|-e|-"
+"i|-r]\n"
+"\n"
+" -d    Mostra os dados correntes do PulseAudio anexados ao ecrã X11 "
+"(default)\n"
+" -e    Exporta dados locais do PulseAudio para o ecrã X11\n"
+" -i    Importa dados do PulseAudio do ecrã X11 para variáveis de ambiente "
+"locais e ficheiro de cookies.\n"
+" -r    Remove dados do PulseAudio do ecrã X11\n"
+
+#: src/utils/pax11publish.c:91
+#, c-format
+msgid "Failed to parse command line.\n"
+msgstr "Não foi possível processar a linha de comando.\n"
+
+#: src/utils/pax11publish.c:110
+#, c-format
+msgid "Server: %s\n"
+msgstr "Servidor: %s\n"
+
+#: src/utils/pax11publish.c:112
+#, c-format
+msgid "Source: %s\n"
+msgstr "Fonte: %s\n"
+
+#: src/utils/pax11publish.c:114
+#, c-format
+msgid "Sink: %s\n"
+msgstr "Sink: %s\n"
+
+#: src/utils/pax11publish.c:116
+#, c-format
+msgid "Cookie: %s\n"
+msgstr "Cookie: %s\n"
+
+#: src/utils/pax11publish.c:134
+#, c-format
+msgid "Failed to parse cookie data\n"
+msgstr "Não foi possível processar os dados da cookie\n"
+
+#: src/utils/pax11publish.c:139
+#, c-format
+msgid "Failed to save cookie data\n"
+msgstr "Não foi possível gravar os dados da cookie\n"
+
+#: src/utils/pax11publish.c:168
+#, c-format
+msgid "Failed to get FQDN.\n"
+msgstr "Falhou ao obter FQDN.\n"
+
+#: src/utils/pax11publish.c:188
+#, c-format
+msgid "Failed to load cookie data\n"
+msgstr "Não foi possível carregar os dados da cookie\n"
+
+#: src/utils/pax11publish.c:206
+#, c-format
+msgid "Not yet implemented.\n"
+msgstr "Ainda não implementado.\n"
+
+#~ msgid "Got signal %s."
+#~ msgstr "Foi obtido o sinal %s."
+
+#~ msgid "Exiting."
+#~ msgstr "A sair."
+
+#~ msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
+#~ msgstr "Foi encontrado utilizador '%s' (UID %lu) e grupo '%s' (GID %lu)."
+
+#~ msgid "Successfully dropped root privileges."
+#~ msgstr "Privilégios de root cedidos com sucesso."
+
+#~ msgid "setrlimit(%s, (%u, %u)) failed: %s"
+#~ msgstr "setrlimit(%s, (%u, %u)) falhou: %s"
+
+#~ msgid "Daemon not running"
+#~ msgstr "Serviço não está a executar"
+
+#~ msgid "Daemon running as PID %u"
+#~ msgstr "Serviço a executar como PID %u"
+
+#~ msgid "Daemon startup successful."
+#~ msgstr "Arranque do serviço sucedeu."
+
+#~ msgid "This is PulseAudio %s"
+#~ msgstr "Isto é PulseAudio %s"
+
+#~ msgid "Compilation host: %s"
+#~ msgstr "Máquina de compilação: %s"
+
+#~ msgid "Compilation CFLAGS: %s"
+#~ msgstr "CFLAGS utilizadas na compilação: %s"
+
+#~ msgid "Running on host: %s"
+#~ msgstr "A executar na máquina: %s"
+
+#~ msgid "Found %u CPUs."
+#~ msgstr "Foram encontrados %u CPUs."
+
+#~ msgid "Page size is %lu bytes"
+#~ msgstr "Tamanho da página é %lu bytes"
+
+#~ msgid "Compiled with Valgrind support: yes"
+#~ msgstr "Compilado com suporte para Valgrind: sim"
+
+#~ msgid "Compiled with Valgrind support: no"
+#~ msgstr "Compilado com suporte para Valgrind: não"
+
+#~ msgid "Running in valgrind mode: %s"
+#~ msgstr "A executar em modo \"valgrind\": %s"
+
+#~ msgid "Running in VM: %s"
+#~ msgstr "A executar em MV: %s"
+
+#~ msgid "Optimized build: yes"
+#~ msgstr "Optimizado: sim"
+
+#~ msgid "Optimized build: no"
+#~ msgstr "Compilação optimizada: não"
+
+#~ msgid "NDEBUG defined, all asserts disabled."
+#~ msgstr "NDEBUG definido, todas as declarações desactivadas."
+
+#~ msgid "FASTPATH defined, only fast path asserts disabled."
+#~ msgstr ""
+#~ "FASTPATH definido, apenas as declarações \"fast path\" desactivadas."
+
+#~ msgid "All asserts enabled."
+#~ msgstr "Todas as declarações desactivadas."
+
+#~ msgid "Machine ID is %s."
+#~ msgstr "O ID da máquina é %s."
+
+#~ msgid "Session ID is %s."
+#~ msgstr "O ID da sessão é %s."
+
+#~ msgid "Using runtime directory %s."
+#~ msgstr "Execução a utilizar o directório %s"
+
+#~ msgid "Using state directory %s."
+#~ msgstr "A manter o estado no directório %s."
+
+#~ msgid "Using modules directory %s."
+#~ msgstr "A utilizar o directório de módulos %s"
+
+#~ msgid "Running in system mode: %s"
+#~ msgstr "Execução em modo de sistema: %s"
+
+#~ msgid "Fresh high-resolution timers available! Bon appetit!"
+#~ msgstr "Timer \"frescos\" de alta resolução disponíveis. Bom apetite!"
+
+#~ msgid ""
+#~ "Dude, your kernel stinks! The chef's recommendation today is Linux with "
+#~ "high-resolution timers enabled!"
+#~ msgstr ""
+#~ "Oh pá, o teu kernel não presta! O prato do dia recomendado é Linux com "
+#~ "timers de alta resolução activos!"
+
+#~ msgid "Failed to initialize daemon."
+#~ msgstr "Falha ao inicializar serviço."
+
+#~ msgid "Daemon startup complete."
+#~ msgstr "Arranque do serviço completo."
+
+#~ msgid "Daemon shutdown initiated."
+#~ msgstr "Encerramento do serviço iniciado."
+
+#~ msgid "Daemon terminated."
+#~ msgstr "Serviço terminado."
+
+#~ msgid "Cleaning up privileges."
+#~ msgstr "A limpar privilégios."
+
+#~ msgid "PulseAudio Sound System KDE Routing Policy"
+#~ msgstr "Sistema de Som PulseAudio Políticas de Roteamento KDE"
+
+#~ msgid "Start the PulseAudio Sound System with KDE Routing Policy"
+#~ msgstr "Inciar o Sistema de Som PulseAudio com Políticas de Roteamento KDE"
+
+#~ msgid "Failed to open configuration file '%s': %s"
+#~ msgstr "Falha ao abrir ficheiro de configuração '%s': %s"
+
+#~ msgid "No cookie loaded. Attempting to connect without."
+#~ msgstr "Nenhuma cookie carregada. A tentar ligar sem cookie."
+
+#~ msgid "Failed to load client configuration file.\n"
+#~ msgstr "Não foi possível carregar o ficheiro de configuração do cliente\n"
+
+#~ msgid "Failed to read environment configuration data.\n"
+#~ msgstr "Não foi possível ler os dados de configuração do ambiente\n"
+
+#~ msgid "Telephony Duplex (HSP/HFP)"
+#~ msgstr "Telefonia Duplex (HSP/HFP)"
+
+#~ msgid "LFE on Separate Mono Output"
+#~ msgstr "LFE na saída separada mono"
+
+#~ msgid "Digital Passthrough (S/PDIF)"
+#~ msgstr "Passagem digital (S/PDIF)"
+
+#~ msgid "Digital Passthrough  (IEC958)"
+#~ msgstr "Pasagem digital (IEC958)"
+
+#~ 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"
+#~ "32le, s32be (defaults to s16ne)\n"
+#~ "\n"
+#~ "See --dump-resample-methods for possible values of resample methods.\n"
+#~ msgstr ""
+#~ "%s [opções]\n"
+#~ "\n"
+#~ "-h, --help                            Mostra esta ajuda\n"
+#~ "-v, --verbose                         Imprime mensagens de depuração\n"
+#~ "      --from-rate=SAMPLERATE          Frequência de amostra A partir em "
+#~ "Hz (predefinida 44100)\n"
+#~ "      --from-format=SAMPLEFORMAT      Tipo de amostra A partir "
+#~ "(predefinido s16le)\n"
+#~ "      --from-channels=CHANNELS        Número de canais A partir "
+#~ "(predefinida 1)\n"
+#~ "      --to-rate=SAMPLERATE            Frequência de amostra Para em Hz "
+#~ "(predefinida 44100)\n"
+#~ "      --to-format=SAMPLEFORMAT        Tipo de amostra Para (predefinida "
+#~ "s16le)\n"
+#~ "      --to-channels=CHANNELS          Número de canais Para (predefinido "
+#~ "1)\n"
+#~ "      --resample-method=METHOD        Método de reamostragem (predefinido "
+#~ "auto)\n"
+#~ "      --seconds=SECONDS               Duração do fluxo A partir "
+#~ "(predefinida 60)\n"
+#~ "\n"
+#~ "Se os formatos não forem especificados, o teste faz todas as combinações "
+#~ "de formatos,\n"
+#~ "para trás e para a frente.\n"
+#~ "\n"
+#~ "O tipo de amostra tem de ser s16le, s16be, u8, float32le, float32be, "
+#~ "ulaw, alaw,\n"
+#~ "s24le, s24be, s24-32le, s24-32be, s32le, s32be (predefinido s16ne)\n"
+#~ "\n"
+#~ "Veja --dump-resample-methods para valores possíveis de métodos de "
+#~ "reamostragem.\n"
+
+=======
 
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
@@ -3596,6 +6033,7 @@ msgstr "Ainda não implementado.\n"
 #~ "Veja --dump-resample-methods para valores possíveis de métodos de "
 #~ "reamostragem.\n"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #~ msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
 #~ msgstr "=== %d segundos: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 62ad3680d..3d628fe04 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,8 +10,13 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2020-09-12 12:12-0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2021-08-04 08:04+0000\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Portuguese (Brazil) <https://translate.fedoraproject.org/"
 "projects/pulseaudio/pulseaudio/pt_BR/>\n"
@@ -19,8 +24,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Gtranslator 3.38.0\n"
+=======
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.7.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -193,10 +203,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail espera argumento booleano"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level espera um argumento em nível de log (seja numérico na faixa de "
 "0..4 seja algum entre debug, info, notice, warn, error)."
@@ -616,7 +632,11 @@ msgid "Line In"
 msgstr "Entrada de linha"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Microfone"
 
@@ -637,12 +657,20 @@ msgid "Internal Microphone"
 msgstr "Microfone interno"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Rádio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Vídeo"
 
@@ -685,12 +713,20 @@ msgid "No Bass Boost"
 msgstr "Sem reforço de graves"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Auto-falante"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Fones de ouvido"
 
@@ -711,8 +747,14 @@ msgid "Analog Output"
 msgstr "Saída analógica"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones 2"
+msgstr "Fones de ouvido"
+=======
 msgid "Headphones 2"
 msgstr "Fones de ouvido 2"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2809
 msgid "Headphones Mono Output"
@@ -759,24 +801,46 @@ msgid "Chat Output"
 msgstr "Saída de bate-papo"
 
 #: src/modules/alsa/alsa-mixer.c:2821
+<<<<<<< HEAD
+#, fuzzy
+msgid "Chat Input"
+msgstr "Saída de bate-papo"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "Destino surround virtual"
+=======
 msgid "Chat Input"
 msgstr "Entrada de bate-papo"
 
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "Surround virtual 7.1"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "Monofônico analógico"
 
 #: src/modules/alsa/alsa-mixer.c:4564
+<<<<<<< HEAD
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "Monofônico analógico"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "Monofônico analógico"
+=======
 msgid "Analog Mono (Left)"
 msgstr "Monofônico analógico (Esquerda)"
 
 #: src/modules/alsa/alsa-mixer.c:4565
 msgid "Analog Mono (Right)"
 msgstr "Monofônico analógico (Direita)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
@@ -799,13 +863,23 @@ msgstr "Estéreo"
 
 # Fone de ouvido não se encaixa como tradução aqui, pois há ou pode haver microfone junto.
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Headset"
 
 #: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+<<<<<<< HEAD
+#, fuzzy
+msgid "Speakerphone"
+msgstr "Auto-falante"
+=======
 msgid "Speakerphone"
 msgstr "Viva voz"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -909,10 +983,17 @@ msgstr "Duplex estéreo"
 
 #: src/modules/alsa/alsa-mixer.c:4739
 msgid "Mono Chat + 7.1 Surround"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 msgstr "Bate-papo monofônico + surround 7.1"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Desligado"
 
@@ -1042,6 +1123,16 @@ msgstr[1] ""
 "É mais provável que isso seja um erro no driver “%s” do ALSA. Por favor, "
 "relate esse problema aos desenvolvedores do ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Entrada Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1050,10 +1141,64 @@ msgstr "Entrada Bluetooth"
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Bluetooth Output"
 msgstr "Saída Bluetooth"
 
 # Desconheço tradução comum para esta palavra.
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Handsfree"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Fones de ouvido"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Portátil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Carro"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefone"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reprodução de alta fidelidade (Destino A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Captura de alta fidelidade (Fonte A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Unidade de headset (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Gateway de Áudio do Headset (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Unidade de headset (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Gateway de Áudio do Headset (HSP/HFP)"
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr "Handsfree"
@@ -1101,6 +1246,7 @@ msgstr "Unidade de handsfree (HFP)"
 #: src/modules/bluetooth/module-bluez5-device.c:2105
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Gateway de áudio do handsfree (HFP)"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
@@ -1203,11 +1349,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Destino nulo temporizado"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Saída nula"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Saída nula"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Falha ao definir formato: string %s de formato inválida"
@@ -1230,14 +1384,24 @@ msgstr "Áudio em @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Túnel para %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Túnel para %s/%s"
@@ -1247,6 +1411,10 @@ msgid "Virtual surround sink"
 msgstr "Destino surround virtual"
 
 #: src/modules/module-virtual-surround-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1261,15 +1429,24 @@ msgstr ""
 "filtrar> format=<formato de amostragem> rate=<taxa da amostragem> "
 "channels=<número de canais> channel_map=<mapa dos canais> "
 "use_volume_sharing=<yes ou no> force_flat_volume=<yes ou no> hrir=/caminho/"
+<<<<<<< HEAD
+"para/hrir_esquerdo.wav autoloaded=<define se esse módulo está sendo "
+"carregado automaticamente> "
+=======
 "para/hrir_esquerdo.wav hrir_left=/caminho/para/hrir_esquerdo.wav hrir_right=/"
 "caminho/para/opcional/hrir_direito.wav autoloaded=<define se esse módulo "
 "está sendo carregado automaticamente> "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/raop/module-raop-discover.c:295
 msgid "Unknown device model"
 msgstr "Modelo desconhecido de dispositivo"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Perfil padrão RAOP"
 
@@ -1587,11 +1764,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Alvo do log inválido."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Áudio interno"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Áudio interno"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1870,7 +2055,11 @@ msgstr "Falha ao definir o fluxo de monitoração: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() falhou: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Falha na conexão: %s"
@@ -1925,9 +2114,13 @@ msgid ""
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -d, --device=DEVICE                   The name of the sink/source to "
+<<<<<<< HEAD
+"connect to\n"
+=======
 "connect to. The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and "
 "@DEFAULT_MONITOR@ can be used to specify the default sink, source and "
 "monitor respectively.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 "      --stream-name=NAME                How to call this stream on the "
@@ -2084,7 +2277,11 @@ msgstr ""
 "Compilado com libpulse %s\n"
 "Vinculado com libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nome do cliente “%s” inválido"
@@ -2157,7 +2354,11 @@ msgstr ""
 "Aviso: a especificação de amostragem especificada será sobrescrita pela "
 "especificação do arquivo."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Falha ao determinar a especificação de amostragem a partir do arquivo."
 
@@ -2193,7 +2394,11 @@ msgstr "reprodução"
 msgid "Failed to set media name."
 msgstr "Falha ao definir o nome da mídia."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() falhou."
 
@@ -2201,11 +2406,19 @@ msgstr "pa_mainloop_new() falhou."
 msgid "io_new() failed."
 msgstr "io_new() falhou."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() falhou."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() falhou."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_new() falhou: %s"
@@ -2214,6 +2427,23 @@ msgstr "pa_context_new() falhou: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() falhou."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() falhou."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NOME [ARGS ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NOME|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() falhou."
@@ -2229,6 +2459,7 @@ msgstr "NOME|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NOME"
 
@@ -2240,7 +2471,11 @@ msgstr "NOME|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NOME|#N 1|0"
 
@@ -2276,7 +2511,11 @@ msgstr "NOME_DE_CAMINHO"
 msgid "FILENAME SINK|#N"
 msgstr "NOME_DE_ARQUIVO DESTINO|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N DESTINO|FONTE"
 
@@ -2284,6 +2523,17 @@ msgstr "#N DESTINO|FONTE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PLACA PERFIL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NOME|#N PORTA"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PLACA PERFIL"
@@ -2293,6 +2543,7 @@ msgid "NAME|#N PORT"
 msgstr "NOME|#N PORTA"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NOME-PLACA|PLACA-#N PORTA POSIÇÃO"
 
@@ -2308,9 +2559,15 @@ msgstr "NÍVEL-NUMÉRICO"
 msgid "FRAMES"
 msgstr "QUADROS"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
+msgstr ""
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "DESTINATÁRIO MENSAGEM [PARÂMETROS_DA_MENSAGEM]"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:82
 #, c-format
@@ -2375,19 +2632,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Falha ao obter estatísticas: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Em uso no momento: %u bloco contendo %s bytes no total.\n"
 msgstr[1] "Em uso no momento: %u blocos contendo %s bytes no total.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2395,22 +2664,39 @@ msgid_plural ""
 msgstr[0] "Alocado por todo o tempo: %u bloco contendo %s bytes no total.\n"
 msgstr[1] "Alocado por todo o tempo: %u blocos contendo %s bytes no total.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Tamanho do cache para amostragem: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Falha ao obter informações do servidor: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2427,7 +2713,11 @@ msgstr ""
 "Índice do cliente: %u\n"
 "Tamanho de fragmento: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2450,6 +2740,77 @@ msgstr ""
 "Fonte padrão: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+#, fuzzy
+msgid "availability unknown"
+msgstr ", grupo de disponibilidade: "
+
+#: src/utils/pactl.c:273
+#, fuzzy
+msgid "available"
+msgstr ", disponível"
+
+#: src/utils/pactl.c:274
+#, fuzzy
+msgid "not available"
+msgstr ", não disponível"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Linha"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mic"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Monofone"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Fone de ouvido"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Rede"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analógico"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "disponibilidade desconhecida"
@@ -2516,11 +2877,16 @@ msgstr "Analógico"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Falha ao obter informações do destino: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2559,11 +2925,27 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortas:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, fuzzy, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr "\t\t%s: %s (tipo: %s, prioridade: %u%s%s%s)\n"
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", grupo de disponibilidade: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2574,22 +2956,36 @@ msgid ", availability group: "
 msgstr ", grupo de disponibilidade: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPorta ativa: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormatos:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Falha ao obter informações da fonte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2628,6 +3024,17 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/d"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2637,11 +3044,16 @@ msgid "n/a"
 msgstr "n/d"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Falha ao obter informações do módulo: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2658,12 +3070,20 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Falha ao obter informações do cliente: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2678,12 +3098,20 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Falha ao obter informações da placa: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2700,21 +3128,44 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tPerfis:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (destino: %u, fontes: %u, prioridade: %u, disponível: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tPerfil ativo: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+#, fuzzy, c-format
+msgid ""
+"\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
+msgstr ""
+"\t\t%s: %s (tipo: %s, prioridade: %u, mudança da latência: %<PRId64> usec%s%s"
+"%s)\n"
+
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1254
 #, c-format
 msgid ""
@@ -2724,6 +3175,7 @@ msgstr ""
 "%s, %s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2732,17 +3184,29 @@ msgstr ""
 "\t\t\tPropriedades:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tParte de perfil/perfis: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Falha ao obter informações da entrada do destino: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2781,12 +3245,20 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Falha ao obter informações da saída da fonte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2825,12 +3297,20 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Falha ao obter informações sobre a amostragem: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2859,11 +3339,41 @@ msgstr ""
 "\tPropriedades:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Falha: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "read() falhou: %s"
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2890,11 +3400,16 @@ msgstr ""
 "um objeto JSON"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Falha ao descarregar o módulo: módulo %s não carregado"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2909,11 +3424,74 @@ msgstr[1] ""
 "Falha ao definir volume: Você tentou definir volumes para %d canais, havendo "
 "suporte ao(s) canal(is) = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Falha ao enviar a amostragem: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Fim prematuro do arquivo"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "novo"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "alterar"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "remover"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "desconhecido"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "destino"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "fonte"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "entrada-destino"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "saída-fonte"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "módulo"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "cliente"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "cache-amostragem"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "servidor"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "placa"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Fim prematuro do arquivo"
@@ -2971,10 +3549,78 @@ msgid "card"
 msgstr "placa"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Evento “%s” em %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT recebido, saindo."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Especificação de volume inválida"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volume fora da faixa admissível.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Número de especificações de volume inválido.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Especificação de volume inconsistente.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[opções]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TIPO]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NOME_DE_ARQUIVO [NOME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NOME [DESTINO]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NOME|#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NOME|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATOS"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT recebido, saindo."
@@ -3040,6 +3686,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATOS"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3051,15 +3698,23 @@ msgstr ""
 "podem ser usados para especificar o destino, a fonte e a monitoração "
 "padrão.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -n, --client-name=NAME                How to call this client on the "
@@ -3073,7 +3728,11 @@ msgstr ""
 "  -n, --client-name=NOME                Como chamar este cliente no "
 "servidor\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3084,16 +3743,31 @@ msgstr ""
 "Compilado com libpulse %s\n"
 "Vinculado com libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Nome do fluxo “%s” inválido"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Especifique nada ou uma de: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Por favor, especifique um arquivo de amostragem a ser carregado"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Falha ao abrir o arquivo de som."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Por favor, especifique um arquivo de amostragem a ser carregado"
@@ -3103,10 +3777,38 @@ msgid "Failed to open sound file."
 msgstr "Falha ao abrir o arquivo de som."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Aviso: Falha ao determinar a especificação da amostragem a partir do arquivo."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Você deve especificar um nome para amostra a ser reproduzida"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Você deve especificar um nome para a amostra a ser removida"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Você deve especificar a entrada do destino e um destino"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Você deve especificar um índice de saída da fonte e uma fonte"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Você deve especificar um nome para o módulo e seus argumentos."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Você deve especificar um nome ou índice do módulo"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Você deve especificar um nome para amostra a ser reproduzida"
@@ -3132,17 +3834,26 @@ msgid "You have to specify a module index or name"
 msgstr "Você deve especificar um nome ou índice do módulo"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Você não pode especificar mais de um destino. Você deve especificar um valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Especificação de suspensão inválida."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Especificação de suspensão inválida."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3150,6 +3861,63 @@ msgstr ""
 "Você não pode especificar mais de uma fonte. Você deve especificar um valor "
 "booleano."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Você deve especificar um nome/índice para a placa e um nome de perfil"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Você deve especificar um nome/índice do destino e o nome da porta"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Você deve especificar um nome de destino"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Você deve especificar um nome/índice da fonte e o nome da porta"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Você deve especificar um nome de fonte"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Você deve especificar um nome de destino"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Você deve especificar um nome/índice do destino e um volume"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Você deve especificar um nome de fonte"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Você deve especificar um nome/índice da fonte e um volume"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Você deve especificar um índice de entrada para o destino e um volume"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Índice de entrada de destino inválido"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Você deve especificar um índice de saída da fonte e um volume"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Índice de saída de fonte inválido"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Você deve especificar um nome/índice para a placa e um nome de perfil"
@@ -3203,36 +3971,58 @@ msgid "Invalid source output index"
 msgstr "Índice de saída de fonte inválido"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Você deve especificar um nome/índice do destino e uma ação de mudo (0, 1 ou "
 "“toogle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Especificação de mudo inválida"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Especificação de mudo inválida"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Você deve especificar um nome/índice da fonte e uma ação de mudo (0, 1 ou "
 "“toogle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Você deve especificar um índice de entrada do destino e uma ação de mudo (0, "
 "1 ou “toogle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Especificação do índice de entrada de destino inválida"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Especificação do índice de entrada de destino inválida"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3240,6 +4030,18 @@ msgstr ""
 "Você deve especificar um índice de saída de fonte e uma ação de mudo (0, 1 "
 "ou “toogle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Especificação do índice de saída de fonte inválida"
+
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "Você deve especificar um nome/índice do destino e o nome da porta"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Especificação do índice de saída de fonte inválida"
@@ -3250,14 +4052,20 @@ msgstr ""
 "Você deve especificar pelo menos um caminho de objeto e um nome de mensagem"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Excesso de argumentos fornecidos, eles serão ignorados. Observe que todos os "
 "parâmetros da mensagem devem ser fornecidos como uma única string."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3265,17 +4073,29 @@ msgstr ""
 "Você deve especificar um índice do destino e uma lista separada por ponto-e-"
 "vírgulas de formatos aceitos"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Você deve especificar nome/índice de uma placa, um nome de porta e uma "
 "mudança de latência"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Não foi possível analisar a mudança da latência"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Não foi possível analisar a mudança da latência"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Nenhum comando válido especificado."
 
diff --git a/po/pulseaudio.pot b/po/pulseaudio.pot
index b4b8552b1..088fe121a 100644
--- a/po/pulseaudio.pot
+++ b/po/pulseaudio.pot
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -481,7 +485,11 @@ msgid "Line In"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr ""
 
@@ -502,12 +510,20 @@ msgid "Internal Microphone"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr ""
 
@@ -543,13 +559,22 @@ msgstr ""
 msgid "No Bass Boost"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-mixer.c:2728 src/modules/bluetooth/module-bluez5-device.c:1894
+#: src/utils/pactl.c:285
+=======
 #: src/modules/alsa/alsa-mixer.c:2728 src/modules/bluetooth/module-bluez5-device.c:1964
 #: src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr ""
 
@@ -657,7 +682,11 @@ msgid "Stereo"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -770,7 +799,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr ""
 
@@ -853,6 +886,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -909,6 +1000,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -983,11 +1075,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr ""
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr ""
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
@@ -1008,12 +1108,20 @@ msgstr ""
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320 src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370 src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564 src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715 src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1348,11 +1456,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr ""
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr ""
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr ""
 
@@ -1627,7 +1743,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr ""
@@ -1750,7 +1870,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1821,7 +1945,11 @@ msgid ""
 "file."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1854,7 +1982,11 @@ msgstr ""
 msgid "Failed to set media name."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1862,11 +1994,19 @@ msgstr ""
 msgid "io_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr ""
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr ""
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1875,6 +2015,22 @@ msgstr ""
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848 src/utils/pactl.c:1855
+#: src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846 src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr ""
@@ -1889,6 +2045,7 @@ msgid "NAME|#N"
 msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642 src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -1900,7 +2057,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -1936,7 +2097,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -1944,6 +2109,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -1953,6 +2129,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -1968,7 +2145,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2026,41 +2207,69 @@ msgstr ""
 msgid "read(): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2071,7 +2280,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2085,6 +2298,74 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr ""
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr ""
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2151,11 +2432,16 @@ msgstr ""
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2177,37 +2463,66 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2229,6 +2544,16 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607 src/utils/pactl.c:649
+#: src/utils/pactl.c:748 src/utils/pactl.c:749 src/utils/pactl.c:760 src/utils/pactl.c:818
+#: src/utils/pactl.c:819 src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr ""
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2238,11 +2563,16 @@ msgid "n/a"
 msgstr ""
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2253,12 +2583,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2268,12 +2606,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2284,44 +2630,76 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2343,12 +2721,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2370,12 +2756,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2392,21 +2786,44 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2416,16 +2833,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas channel(s) "
@@ -2436,11 +2862,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr ""
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr ""
@@ -2498,10 +2987,78 @@ msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr ""
@@ -2567,6 +3124,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2574,7 +3132,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2587,7 +3149,11 @@ msgid ""
 "  -n, --client-name=NAME                How to call this client on the server\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2595,16 +3161,156 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr ""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr ""
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+msgid "You may not specify more than one sink. You have to specify a boolean value."
+msgstr ""
+
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+msgid "You may not specify more than one source. You have to specify a boolean value."
+msgstr ""
+
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr ""
+
+#: src/utils/pactl.c:2274
+msgid "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
+msgstr ""
+
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr ""
+
+#: src/utils/pactl.c:2299
+msgid "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
+msgstr ""
+
+#: src/utils/pactl.c:2314
+msgid "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
+msgstr ""
+
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+msgid "You have to specify a source output index and a mute action (0, 1, or 'toggle')"
+msgstr ""
+
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr ""
@@ -2739,16 +3445,32 @@ msgid "You have to specify at least an object path and a message name"
 msgstr ""
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message parameters must be "
 "given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported formats"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -2758,6 +3480,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 5286405c3..c95a14426 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,9 +9,15 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-07-01 13:04+0000\n"
+"Last-Translator: Alexey Rubtsov <rushills@gmail.com>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-05-23 11:18+0000\n"
 "Last-Translator: Sergey A. <sw@atrus.ru>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: Russian <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/ru/>\n"
 "Language: ru\n"
@@ -20,7 +26,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.7.1\n"
+=======
 "X-Generator: Weblate 4.12.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -153,6 +163,19 @@ msgstr ""
 "изменения частотных характеристик\n"
 "                                        («--dump-resample-methods» для "
 "просмотра\n"
+<<<<<<< HEAD
+"                                        списка возможных значений.\n"
+"      --use-pid-file[=ЛОГ.]             Создать файл с идентификатором "
+"процесса\n"
+"                                        (PID).\n"
+"      --no-cpu-limit[=ЛОГ.]             Не устанавливать ограничитель "
+"загрузки\n"
+"                                        процессора на платформах, на которых "
+"он\n"
+"                                        поддерживается.\n"
+"      --disable-shm[=ЛОГ.]              Выключить поддержку общей памяти.\n"
+"      --enable-memfd[=ЛОГ.]             Включить поддержку общей памяти "
+=======
 "                                        списка возможных значений)\n"
 "      --use-pid-file[=BOOL]             Создать файл с идентификатором "
 "процесса (PID)\n"
@@ -162,6 +185,7 @@ msgstr ""
 "поддерживается.\n"
 "      --disable-shm[=BOOL]              Отключить поддержку общей памяти.\n"
 "      --enable-memfd[=BOOL]             Включить поддержку общей памяти "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "memfd.\n"
 "\n"
 "СЦЕНАРИИ ЗАПУСКА:\n"
@@ -610,7 +634,11 @@ msgid "Line In"
 msgstr "Линейный вход"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Микрофон"
 
@@ -632,13 +660,21 @@ msgstr "Встроенный микрофон"
 
 # BUGME: please clarify, is this FM Radio or some digital radio frequency channel? --aspotashev
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Радио"
 
 # BUGME: please clarify? --aspotashev
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Видео"
 
@@ -675,12 +711,20 @@ msgid "No Bass Boost"
 msgstr "Нет усиления басов"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Динамик"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Наушники"
 
@@ -788,7 +832,11 @@ msgid "Stereo"
 msgstr "Стерео"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Гарнитура"
 
@@ -870,7 +918,11 @@ msgstr "Цифровой объёмный 5.1 (HDMI)"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr "Разговор"
+=======
 msgstr "Чат"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
@@ -901,7 +953,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Моно разговор + 7.1 окружающий звук"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Выключено"
 
@@ -915,7 +971,11 @@ msgstr "%s выход"
 msgid "%s Input"
 msgstr "%s вход"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -932,7 +992,11 @@ msgstr ""
 "Процесс разбужен с установленным POLLOUT, однако последующий вызов "
 "snd_pcm_avail() вернул 0 или другое значение, меньшее чем min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1046,6 +1110,36 @@ msgstr[2] ""
 "Вероятно, это ошибка в драйвере ALSA «%s». Пожалуйста, сообщите об этой "
 "проблеме разработчикам ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Вход Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Выход Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Хендс-фри"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Наушник"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Портативный динамик"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Автомобильный динамик"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1074,10 +1168,38 @@ msgid "Car"
 msgstr "Автомобильный динамик"
 
 #: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "HiFi"
 msgstr "Hi-Fi"
 
 # BUGME: please clarify, does this mean a cell phone? --aspotashev
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Воспроизведение высокого качества (приёмник A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Запись высокого качества (передатчик A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Гарнитура (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Адаптер аудиогарнитуры (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Гарнитура (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
 msgid "Phone"
 msgstr "Телефон"
@@ -1103,6 +1225,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Гарнитура (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Адаптер аудиогарнитуры (HFP)"
 
@@ -1211,11 +1334,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Синхронный пустой аудиоприёмник"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Пустой выход"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Пустой выход"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Не удалось задать формат: недопустимый формат «%s»"
@@ -1238,14 +1369,24 @@ msgstr "Аудио на @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Туннель для %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Туннель к %s/%s"
@@ -1268,7 +1409,11 @@ msgstr ""
 "приёмника для фильтрации> sink_master=<имя приёмника для фильтрации> "
 "format=<формат отсчётов> rate=<частота дискретизации> channels=<число "
 "каналов> channel_map=<схема каналов> use_volume_sharing=<использовать общий "
+<<<<<<< HEAD
+"уровень (yes или no)> force_flat_volume=<yes или no> hrir=/путь/к/left_hrir."
+=======
 "уровень (yes или no)> force_flat_volume=<yes или no> hrir=/path/to/left_hrir."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "wav hrir_left=/path/to/left_hrir.wav hrir_right=/path/to/optional/right_hrir."
 "wav autoloaded=<установлено, если этот модуль загружается автоматически> "
 
@@ -1276,7 +1421,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Неизвестная модель устройства"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Стандартный профиль RAOP"
 
@@ -1597,11 +1746,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Недопустимый журнал."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Встроенное аудио"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Встроенное аудио"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Модем"
 
@@ -1881,7 +2038,11 @@ msgstr "Не удалось установить мониторный поток
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Произошла ошибка при выполнении pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Ошибка подключения: %s"
@@ -1920,7 +2081,7 @@ msgid "pa_stream_update_timing_info() failed: %s"
 msgstr "Произошла ошибка при выполнении pa_stream_update_timing_info(): %s"
 
 #: src/utils/pacat.c:676
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s [options]\n"
 "%s\n"
@@ -2090,7 +2251,11 @@ msgstr ""
 "Скомпилировано с libpulse %s\n"
 "Скомпоновано с libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Недопустимое имя клиента «%s»"
@@ -2163,7 +2328,11 @@ msgstr ""
 "Предупреждение: указанная спецификация отсчётов будет заменена спецификацией "
 "из файла."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Не удалось определить спецификацию отсчётов из файла."
 
@@ -2199,7 +2368,11 @@ msgstr "воспроизведения"
 msgid "Failed to set media name."
 msgstr "Не удалось установить имя потока."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Произошла ошибка при выполнении pa_mainloop_new()."
 
@@ -2207,11 +2380,19 @@ msgstr "Произошла ошибка при выполнении pa_mainloop_
 msgid "io_new() failed."
 msgstr "Произошла ошибка при выполнении io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Произошла ошибка при выполнении pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Произошла ошибка при выполнении pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Произошла ошибка при выполнении pa_context_connect(): %s"
@@ -2220,6 +2401,23 @@ msgstr "Произошла ошибка при выполнении pa_context_c
 msgid "pa_context_rttime_new() failed."
 msgstr "Произошла ошибка при выполнении pa_context_rttime_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Произошла ошибка при выполнении pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "ИМЯ [АРГУМЕНТЫ ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "ИМЯ|№"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Произошла ошибка при выполнении pa_mainloop_run()."
@@ -2235,6 +2433,7 @@ msgstr "ИМЯ|№"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "ИМЯ"
 
@@ -2246,7 +2445,11 @@ msgstr "ИМЯ|№ ГРОМКОСТЬ"
 msgid "#N VOLUME"
 msgstr "№ ГРОМКОСТЬ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "ИМЯ|№ 1|0"
 
@@ -2282,7 +2485,11 @@ msgstr "ПУТЬ"
 msgid "FILENAME SINK|#N"
 msgstr "ИМЯ_ФАЙЛА АУДИОПРИЁМНИК|№"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "№ АУДИОПРИЁМНИК|ИСТОЧНИК"
 
@@ -2290,6 +2497,17 @@ msgstr "№ АУДИОПРИЁМНИК|ИСТОЧНИК"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "ПЛАТА ПРОФИЛЬ"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "ИМЯ|№ ПОРТ"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "ПЛАТА ПРОФИЛЬ"
@@ -2299,6 +2517,7 @@ msgid "NAME|#N PORT"
 msgstr "ИМЯ|№ ПОРТ"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "ИМЯ_ПЛАТЫ|№_ПЛАТЫ ПОРТ ЗАДЕРЖКА"
 
@@ -2314,7 +2533,11 @@ msgstr "ЧИСЛОВОЙ-УРОВЕНЬ"
 msgid "FRAMES"
 msgstr "КАДРОВ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "СООБЩЕНИЕ ПОЛУЧАТЕЛЯ [ПАРАМЕТРЫ_СООБЩЕНИЯ]"
 
@@ -2382,12 +2605,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Не удалось получить статистику: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2396,7 +2627,11 @@ msgstr[1] "Сейчас используется: %u блока, содержа
 msgstr[2] ""
 "Сейчас используется: %u блоков, содержащих в совокупности %s байт.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2408,16 +2643,33 @@ msgstr[1] ""
 msgstr[2] ""
 "Выделено за всё время: %u блоков, содержащих в совокупности %s байт.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Размер кэша сэмплов: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Не удалось получить информацию о сервере: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+# Tile Size = PA_MEMPOOL_SLOT_SIZE in src/pulsecore/memblock.c. --aspotashev
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
@@ -2425,6 +2677,7 @@ msgstr "%s\n"
 
 # Tile Size = PA_MEMPOOL_SLOT_SIZE in src/pulsecore/memblock.c. --aspotashev
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2441,7 +2694,11 @@ msgstr ""
 "Номер клиента: %u\n"
 "Размер блока памяти: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2464,6 +2721,77 @@ msgstr ""
 "Источник по умолчанию: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "доступность неясна"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "доступен"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "не доступен"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: src/utils/pactl.c:284
+#, fuzzy
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Линейный вход/выход"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Микрофон"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Гарнитура"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Наушник"
+
+#: src/utils/pactl.c:292
+#, fuzzy
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+#, fuzzy
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "ТВ"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Сеть"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Аналоговый"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "доступность неясна"
@@ -2530,11 +2858,16 @@ msgstr "Аналоговый"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Не удалось получить информацию об аудиоприёмнике: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2573,11 +2906,29 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tПорты:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+#, fuzzy, c-format
+msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
+msgstr ""
+"\t\t%s: %s (аудиоприёмников: %u, источников: %u, приоритет: %u, доступен: "
+"%s)\n"
+
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", группа доступности: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
@@ -2588,22 +2939,36 @@ msgid ", availability group: "
 msgstr ", группа доступности: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tАктивный порт: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tФорматы:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Не удалось получить информацию об источнике: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2642,6 +3007,17 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "н/д"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2651,11 +3027,16 @@ msgid "n/a"
 msgstr "н/д"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Не удалось получить информацию о модуле: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2672,12 +3053,20 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Не удалось получить информацию о клиенте: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2692,12 +3081,20 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Не удалось получить информацию о звуковой плате: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2714,32 +3111,53 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tПрофили:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 "\t\t%s: %s (аудиоприёмников: %u, источников: %u, приоритет: %u, доступен: "
 "%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tАктивный профиль: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:679
+=======
 "\t\t%s: %s (тип: %s, приоритет: %u, смещение задержки: %<PRId64> мкс%s%s, "
 "%s)\n"
 
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2748,17 +3166,29 @@ msgstr ""
 "\t\t\tСвойства:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tВходит в профиль(и): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Не удалось получить информацию о входе аудиоприёмника: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2797,12 +3227,20 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Не удалось получить информацию о выходе источника: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2841,12 +3279,20 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Не удалось получить информацию о сэмплах: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2875,16 +3321,45 @@ msgstr ""
 "\tСвойства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Произошла ошибка: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Ошибка при отправлении сообщения: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2906,11 +3381,16 @@ msgstr ""
 "JSON"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Не удалось выгрузить модуль: модуль «%s» не загружен"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2928,15 +3408,38 @@ msgstr[2] ""
 "Не удалось задать громкость: вы попытались задать громкость для %d каналов, "
 "но число поддерживаемых каналов не совпадает и равно %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Не удалось загрузить сэмпл в кэш: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+=======
 #: src/utils/pactl.c:2124
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Premature end of file"
 msgstr "Неожиданный конец файла"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "появление"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "изменение"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "удаление"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+=======
 #: src/utils/pactl.c:2144
 msgid "new"
 msgstr "появление"
@@ -2950,68 +3453,176 @@ msgid "remove"
 msgstr "удаление"
 
 #: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "unknown"
 msgstr "(неизвестно)"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1394
+=======
 #: src/utils/pactl.c:2161
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "sink"
 msgstr "аудиоприёмника"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1397
+=======
 #: src/utils/pactl.c:2164
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "source"
 msgstr "источника"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1400
+=======
 #: src/utils/pactl.c:2167
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "sink-input"
 msgstr "входа аудиоприёмника"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1403
+=======
 #: src/utils/pactl.c:2170
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "source-output"
 msgstr "выхода источника"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1406
+=======
 #: src/utils/pactl.c:2173
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "module"
 msgstr "модуля"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1409
+=======
 #: src/utils/pactl.c:2176
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "client"
 msgstr "клиента"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1412
+=======
 #: src/utils/pactl.c:2179
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "sample-cache"
 msgstr "кэшированного сэмпла"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "server"
 msgstr "сервера"
 
 # [event-facility] --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+=======
 #: src/utils/pactl.c:2185
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "card"
 msgstr "платы"
 
 # "Событие [event-type] в отношении [event-facility] #N", поэтому все строки [event-facility] выше пишем в родительном падеже. --aspotashev
+<<<<<<< HEAD
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Событие «%s» в отношении %s №%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Получен сигнал для остановки (SIGINT), выход."
+
+#: src/utils/pactl.c:1762
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Получен сигнал для остановки (SIGINT), выход."
 
 #: src/utils/pactl.c:2547
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid volume specification"
 msgstr "Недопустимое значение громкости"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Указанная громкость выходит за границы разрешённого диапазона.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Недопустимое количество значений громкости.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Несогласованные способы указания значений громкости.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[параметры]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[ТИП]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "ИМЯ_ФАЙЛА [ИМЯ]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "ИМЯ [АУДИОПРИЁМНИК]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "ИМЯ|№ ГРОМКОСТЬ [ГРОМКОСТЬ ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "№ ГРОМКОСТЬ [ГРОМКОСТЬ ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "ИМЯ|№ 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "№ 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "№ ФОРМАТЫ"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2581
 msgid "Volume outside permissible range.\n"
 msgstr "Указанная громкость выходит за границы разрешённого диапазона.\n"
@@ -3069,6 +3680,7 @@ msgid "#N FORMATS"
 msgstr "№ ФОРМАТЫ"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3080,7 +3692,11 @@ msgstr ""
 "можно использовать для указания аудиоприёмника, источника и монитора, "
 "используемых по умолчанию.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3103,7 +3719,11 @@ msgstr ""
 "  -s, --server=СЕРВЕР                   Имя сервера для подключения\n"
 "  -n, --client-name=ИМЯ                 Имя этого клиента на сервере\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3114,20 +3734,39 @@ msgstr ""
 "Скомпилировано с libpulse %s\n"
 "Скомпоновано с libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Недопустимое значение формата «%s»"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Не указывайте ничего либо укажите одно из: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+=======
 #: src/utils/pactl.c:2788
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Please specify a sample file to load"
 msgstr "Необходимо указать файл, из которого будет загружен сэмпл"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Не удалось открыть аудиофайл."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Предупреждение: не удалось определить спецификацию отсчётов из файла."
+
+#: src/utils/pactl.c:2011
+=======
 #: src/utils/pactl.c:2801
 msgid "Failed to open sound file."
 msgstr "Не удалось открыть аудиофайл."
@@ -3137,42 +3776,75 @@ msgid "Warning: Failed to determine sample specification from file."
 msgstr "Предупреждение: не удалось определить спецификацию отсчётов из файла."
 
 #: src/utils/pactl.c:2823
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sample name to play"
 msgstr "Необходимо указать имя сэмпла для воспроизведения"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2023
+=======
 #: src/utils/pactl.c:2835
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sample name to remove"
 msgstr "Необходимо указать имя сэмпла для удаления"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2032
+=======
 #: src/utils/pactl.c:2844
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink input index and a sink"
 msgstr "Необходимо указать номер входа аудиоприёмника и аудиоприёмник"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2042
+=======
 #: src/utils/pactl.c:2854
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a source"
 msgstr "Необходимо указать номер выхода источника и источник"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Необходимо указать имя модуля и аргументы."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2869
 msgid "You have to specify a module name and arguments."
 msgstr "Необходимо указать имя модуля и аргументы."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a module index or name"
 msgstr "Необходимо указать номер или имя модуля"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Нельзя указывать больше одного аудиоприёмника. Необходимо указать логическое "
 "значение."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid suspend specification."
 msgstr ""
 "Недопустимое значение операции приостановки, ожидалось логическое значение."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3180,23 +3852,43 @@ msgstr ""
 "Нельзя указывать больше одного источника. Необходимо указать логическое "
 "значение."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+=======
 #: src/utils/pactl.c:2939
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Необходимо указать имя или номер звуковой платы и имя профиля"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2138
+=======
 #: src/utils/pactl.c:2950
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name/index and a port name"
 msgstr "Необходимо указать имя или номер аудиоприёмника и имя порта"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name"
 msgstr "Необходимо указать имя аудиоприёмника"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+=======
 #: src/utils/pactl.c:2974
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source name/index and a port name"
 msgstr "Необходимо указать имя или номер источника и имя порта"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source name"
 msgstr "Необходимо указать имя источника"
 
@@ -3204,65 +3896,124 @@ msgstr "Необходимо указать имя источника"
 msgid "You have to specify a sink name/index"
 msgstr "Необходимо указать имя или номер аудиоприёмника"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Необходимо указать имя аудиоприёмника."
+
+#: src/utils/pactl.c:2196
+=======
 #: src/utils/pactl.c:3008
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Необходимо указать имя или номер аудиоприёмника и громкость"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Необходимо указать имя источника."
+
+#: src/utils/pactl.c:2219
+=======
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
 msgid "You have to specify a source name/index"
 msgstr "Необходимо указать имя или номер источника"
 
 #: src/utils/pactl.c:3031
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source name/index and a volume"
 msgstr "Необходимо указать имя или номер источника и громкость"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2232
+=======
 #: src/utils/pactl.c:3044
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink input index and a volume"
 msgstr "Необходимо указать номер входа аудиоприёмника и громкость"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2237
+=======
 #: src/utils/pactl.c:3049
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid sink input index"
 msgstr "Недопустимый номер входа аудиоприёмника"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a volume"
 msgstr "Необходимо указать номер выхода источника и громкость"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid source output index"
 msgstr "Недопустимый номер выхода источника"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Необходимо указать имя или номер аудиоприёмника и логическое значение "
 "выключения звука (0, 1 или «toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid mute specification"
 msgstr "Недопустимое логическое значение выключения звука"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Необходимо указать имя или номер источника и логическое значение выключения "
 "звука (0, 1 или «toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Необходимо указать номер входа аудиоприёмника и логическое значение "
 "выключения звука (0, 1 или «toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+=======
 #: src/utils/pactl.c:3131
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid sink input index specification"
 msgstr "Недопустимый номер входа аудиоприёмника"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3270,7 +4021,11 @@ msgstr ""
 "Необходимо указать номер выхода источника и логическое значение выключения "
 "звука (0, 1 или «toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid source output index specification"
 msgstr "Недопустимый номер выхода источника"
 
@@ -3278,15 +4033,28 @@ msgstr "Недопустимый номер выхода источника"
 msgid "You have to specify at least an object path and a message name"
 msgstr "Вы должны указать как минимум путь к объекту и имя сообщения"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "Вы должны указать как минимум путь к объекту и имя сообщения"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "Даны лишние аргументы, они будут проигнорированы. Обратите внимание, что все "
 "параметры сообщения должны быть предоставлены в виде одной строки."
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3294,15 +4062,27 @@ msgstr ""
 "Необходимо указать номер аудиоприёмника и разделённый запятыми список "
 "поддерживаемых форматов"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Необходимо указать имя или номер звуковой платы, имя порта и задержку"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+=======
 #: src/utils/pactl.c:3201
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Could not parse latency offset"
 msgstr "Недопустимое значение задержки"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Имя команды не указано или не распознано."
 
@@ -3348,7 +4128,7 @@ msgid "WARNING: Child process terminated by signal %u\n"
 msgstr "Предупреждение: дочерний процесс завершён по сигналу %u\n"
 
 #: src/utils/pasuspender.c:228
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s [options] -- PROGRAM [ARGUMENTS ...]\n"
 "\n"
@@ -3466,6 +4246,8 @@ msgstr "Не удалось загрузить данные cookie.\n"
 msgid "Not yet implemented.\n"
 msgstr "Не реализовано.\n"
 
+<<<<<<< HEAD
+=======
 #~ msgid ""
 #~ "%s [options]\n"
 #~ "%s\n"
@@ -3595,6 +4377,7 @@ msgstr "Не реализовано.\n"
 #~ "      --monitor-stream=INDEX            Запись с входа приёмника с "
 #~ "индексом INDEX.\n"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #~ msgid "Failed to initialize daemon."
 #~ msgstr "Не удалось инициализировать демон."
 
diff --git a/po/si.po b/po/si.po
index 8d2cd1787..6d13a5734 100644
--- a/po/si.po
+++ b/po/si.po
@@ -8,17 +8,27 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2021-08-19 21:04+0000\n"
 "Last-Translator: Hela Basa <r45xveza@pm.me>\n"
 "Language-Team: Sinhala <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/si/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+<<<<<<< HEAD
+=======
 "X-Generator: Weblate 4.7.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -103,7 +113,11 @@ msgstr ""
 #: src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
+<<<<<<< HEAD
+"of debug, info, notice, warn, error)."
+=======
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 
 #: src/daemon/cmdline.c:277
@@ -498,7 +512,11 @@ msgid "Line In"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr ""
 
@@ -519,12 +537,20 @@ msgid "Internal Microphone"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr ""
 
@@ -561,12 +587,20 @@ msgid "No Bass Boost"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr ""
 
@@ -674,7 +708,11 @@ msgid "Stereo"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -787,7 +825,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr ""
 
@@ -801,7 +843,11 @@ msgstr ""
 msgid "%s Input"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -812,7 +858,11 @@ msgid ""
 "returned 0 or another value < min_avail."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -877,6 +927,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -933,6 +1041,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -980,8 +1089,13 @@ msgid ""
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1011,11 +1125,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr ""
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr ""
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
@@ -1038,14 +1160,24 @@ msgstr ""
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1069,7 +1201,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1280,7 +1416,10 @@ msgstr ""
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr ""
 
@@ -1382,11 +1521,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr ""
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr ""
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr ""
 
@@ -1661,7 +1808,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr ""
@@ -1716,9 +1867,13 @@ msgid ""
 "  -s, --server=SERVER                   The name of the server to connect "
 "to\n"
 "  -d, --device=DEVICE                   The name of the sink/source to "
+<<<<<<< HEAD
+"connect to\n"
+=======
 "connect to. The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and "
 "@DEFAULT_MONITOR@ can be used to specify the default sink, source and "
 "monitor respectively.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAME                How to call this client on the "
 "server\n"
 "      --stream-name=NAME                How to call this stream on the "
@@ -1797,7 +1952,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr ""
@@ -1868,7 +2027,11 @@ msgid ""
 "specification from file."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr ""
 
@@ -1902,7 +2065,11 @@ msgstr ""
 msgid "Failed to set media name."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1910,11 +2077,19 @@ msgstr ""
 msgid "io_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr ""
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr ""
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1923,6 +2098,23 @@ msgstr ""
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr ""
@@ -1938,6 +2130,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -1949,7 +2142,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -1985,7 +2182,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -1993,6 +2194,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2002,6 +2214,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2017,7 +2230,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2075,19 +2292,31 @@ msgstr ""
 msgid "read(): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2095,22 +2324,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2121,7 +2366,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2135,6 +2384,74 @@ msgid ""
 "Cookie: %04x:%04x\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr ""
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr ""
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2201,11 +2518,16 @@ msgstr ""
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2227,37 +2549,66 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2279,6 +2630,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr ""
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2288,11 +2650,16 @@ msgid "n/a"
 msgstr ""
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2303,12 +2670,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2318,12 +2693,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2334,45 +2717,77 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2394,12 +2809,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2421,12 +2844,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2443,21 +2874,44 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2467,16 +2921,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2487,11 +2950,74 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr ""
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr ""
@@ -2549,10 +3075,78 @@ msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr ""
@@ -2618,6 +3212,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2625,22 +3220,33 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
 "      --version                         Show version\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=FORMAT                   The format of the output. Either "
 "\"normal\" or \"json\"\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -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 ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2648,16 +3254,59 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr ""
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr ""
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr ""
@@ -2695,20 +3344,84 @@ msgid "You have to specify a module index or name"
 msgstr ""
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr ""
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr ""
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
@@ -2762,35 +3475,68 @@ msgid "Invalid source output index"
 msgstr ""
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr ""
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr ""
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr ""
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr ""
@@ -2800,17 +3546,33 @@ msgid "You have to specify at least an object path and a message name"
 msgstr ""
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
@@ -2820,6 +3582,7 @@ msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr ""
 
@@ -2920,7 +3683,11 @@ msgstr ""
 #: src/utils/pax11publish.c:110
 #, c-format
 msgid "Server: %s\n"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "සේවාදායකය: %s\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pax11publish.c:112
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index bb59a6dc2..2d35d18b2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: PulseAudio master\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2020-11-25 08:35+0000\n"
 "Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <https://translate.fedoraproject.org/projects/"
@@ -504,7 +508,11 @@ msgid "Line In"
 msgstr "Vstupná linka"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofón"
 
@@ -525,12 +533,20 @@ msgid "Internal Microphone"
 msgstr "Vstavaný mikrofón"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Rádio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -567,12 +583,20 @@ msgid "No Bass Boost"
 msgstr "Bez zosilnenia basov"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Reproduktor"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Slúchadlá"
 
@@ -688,7 +712,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Headset"
 
@@ -803,7 +831,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -817,7 +849,11 @@ msgstr "%s výstup"
 msgid "%s Input"
 msgstr "%s vstup"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -828,7 +864,11 @@ msgid ""
 "returned 0 or another value < min_avail."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -896,6 +936,66 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Vstup cez Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Výstup cez Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Handsfree"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Slúchadlo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Prenosné"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Automobil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefón"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "HiFi prehrávanie (cieľ A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "HiFi zaznamenávanie (zdroj A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Brána zvuku pre handsfree (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Brána zvuku pre handsfree (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -954,6 +1054,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Brána zvuku pre handsfree (HSP/HFP)"
@@ -1002,8 +1103,13 @@ msgid ""
 "this module is being loaded automatically> use_volume_sharing=<yes or no> "
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1033,11 +1139,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Prázdny výstup"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Prázdny výstup"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Zlyhalo nastavenie formátu: neplatný reťazec formátu %s"
@@ -1060,14 +1174,24 @@ msgstr "Zvuk na @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunel pre %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunel do %s/%s"
@@ -1085,6 +1209,19 @@ msgid ""
 "force_flat_volume=<yes or no> hrir=/path/to/left_hrir.wav hrir_left=/path/to/"
 "left_hrir.wav hrir_right=/path/to/optional/right_hrir.wav autoloaded=<set if "
 "this module is being loaded automatically> "
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/raop/module-raop-discover.c:295
+#, fuzzy
+msgid "Unknown device model"
+msgstr "Neznámy kód chyby"
+
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+=======
 msgstr ""
 
 #: src/modules/raop/module-raop-discover.c:295
@@ -1096,6 +1233,7 @@ msgstr "Neznámy kód chyby"
 msgid "RAOP standard profile"
 msgstr ""
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
 msgstr "Zvukový server PulseAudio"
@@ -1303,7 +1441,10 @@ msgstr "Horný zadný pravý"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(neplatné)"
 
@@ -1405,11 +1546,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Neplatný cieľ záznamu."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Vstavaný zvuk"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Vstavaný zvuk"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1684,7 +1833,11 @@ msgstr ""
 msgid "pa_stream_connect_record() failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Zlyhanie pripojenia: %s"
@@ -1820,7 +1973,11 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Neplatný názov klienta „%s“"
@@ -1893,7 +2050,11 @@ msgstr ""
 "Upozornenie: špecifikovaná špecifikácia vzoriek bude prepísaná špecifikáciou "
 "zo súboru."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Zlyhalo rozpoznanie špecifikácie vzoriek zo súboru."
 
@@ -1927,7 +2088,11 @@ msgstr "prehrávanie"
 msgid "Failed to set media name."
 msgstr "Zlyhalo nastavenie názvu média."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr ""
 
@@ -1935,11 +2100,19 @@ msgstr ""
 msgid "io_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr ""
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr ""
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr ""
@@ -1948,6 +2121,23 @@ msgstr ""
 msgid "pa_context_rttime_new() failed."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NÁZOV [PARAMETRE ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NÁZOV|Č."
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr ""
@@ -1963,6 +2153,7 @@ msgstr "NÁZOV|Č."
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NÁZOV"
 
@@ -1974,7 +2165,11 @@ msgstr "NÁZOV|Č. HLASITOSŤ"
 msgid "#N VOLUME"
 msgstr "Č. HLASITOSŤ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "BÁZOV|Č. 1|0"
 
@@ -2010,7 +2205,11 @@ msgstr "NÁZOV_CESTY"
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "Č. CIEĽU|ZDROJ"
 
@@ -2018,6 +2217,17 @@ msgstr "Č. CIEĽU|ZDROJ"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "PROFIL KARTY"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NÁZOV|Č. PORTU"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "PROFIL KARTY"
@@ -2027,6 +2237,7 @@ msgid "NAME|#N PORT"
 msgstr "NÁZOV|Č. PORTU"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "NÁZOV_KARTY|KARTA-Č. PORT POSUNUTIE"
 
@@ -2042,7 +2253,11 @@ msgstr "ČÍSLO-ÚROVEŇ"
 msgid "FRAMES"
 msgstr "SNÍMKY"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2107,12 +2322,20 @@ msgstr ""
 msgid "read(): %s"
 msgstr "čítanie(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Zlyhalo získanie štatistiky: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2120,7 +2343,11 @@ msgstr[0] "Aktuálne sa používa: %u blokov obsahujúcich celkovo %s bajtov.\n"
 msgstr[1] "Aktuálne sa používa: %u blokov obsahujúcich celkovo %s bajtov.\n"
 msgstr[2] "Aktuálne sa používa: %u blokov obsahujúcich celkovo %s bajtov.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2129,22 +2356,38 @@ msgstr[0] "Aktuálne sa používa: %u blokov obsahujúcich celkovo %s bajtov.\n"
 msgstr[1] "Aktuálne sa používa: %u blokov obsahujúcich celkovo %s bajtov.\n"
 msgstr[2] "Aktuálne sa používa: %u blokov obsahujúcich celkovo %s bajtov.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Veľkosť vyrovnávacej pamäte vzoriek: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Zlyhalo získanie informácií o serveri: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2155,7 +2398,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2178,6 +2425,79 @@ msgstr ""
 "Predvolený zdroj: %s\n"
 "Cookie: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "neznámy"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "Vstupná linka"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+#, fuzzy
+msgid "Handset"
+msgstr "Headset"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+#, fuzzy
+msgid "Bluetooth"
+msgstr "Vstup cez Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "Analógový mono"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2249,11 +2569,16 @@ msgstr "Analógový mono"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Zlyhalo získanie informácií o cieli: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2275,37 +2600,66 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorty:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (ciele: %u, zdroje: %u, priorita: %u, dostupné: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktívny port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormáty:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Zlyhalo získanie informácií o zdroji: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2327,6 +2681,17 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "nedostupné"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2336,11 +2701,16 @@ msgid "n/a"
 msgstr "nedostupné"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Zlyhalo získavanie informácií o module: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2357,12 +2727,20 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Zlyhalo získanie informácií o klientovi: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2377,12 +2755,20 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Zlyhalo získavanie informácií o karte: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2399,28 +2785,48 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfily:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (ciele: %u, zdroje: %u, priorita: %u, dostupné: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktívny profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2429,17 +2835,29 @@ msgstr ""
 "\t\t\tVlastnosti:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tČasť profilu(ov): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2478,12 +2896,20 @@ msgstr ""
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2505,12 +2931,20 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Zlyhalo získanie informácií o vzorke: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2527,11 +2961,41 @@ msgid ""
 "\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Zlyhanie: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+#, c-format
+msgid "Send message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1667
 #, c-format
 msgid "Send message failed: %s"
@@ -2556,11 +3020,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Zlyhalo uvoľnenie modulu: Modul %s nie je načítaný"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2578,11 +3047,74 @@ msgstr[2] ""
 "Zlyhalo nastavenie hlasitosti: Pokúsili ste sa nastaviť hlasitosti pre %d "
 "kanály/ov, pričom podporovaných je kanálov je %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Zlyhalo nahratie vzorku: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Predčasný koniec súboru"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "nový"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "zmeniť"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "odstrániť"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "neznámy"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "cieľ"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "zdroj"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klient"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "karta"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Predčasný koniec súboru"
@@ -2640,10 +3172,78 @@ msgid "card"
 msgstr "karta"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Udalosť „%s“ na %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Získaný príkaz SIGINT. Ukončuje sa."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Neplatná špecifikácia hlasitosti"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Hlasitosť mimo povoleného rozsahu.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Neplatný počet špecifikácií hlasitosti.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Nekonzistentná špecifikácia hlasitosti.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[voľby]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYP]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "NÁZOV_SÚBORU [NÁZOV]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NÁZOV [CIEĽ]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NÁZOV|Č. HLASITOSŤ [HLASITOSŤ ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "Č. HLASITOSŤ [HLASITOSŤ ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NÁZOV|Č. 1|0|prepínač"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "Č. 1|0|prepínač"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "Č. FORMÁTY"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Získaný príkaz SIGINT. Ukončuje sa."
@@ -2709,6 +3309,7 @@ msgid "#N FORMATS"
 msgstr "Č. FORMÁTY"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2716,8 +3317,13 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -2738,7 +3344,11 @@ msgstr ""
 "  -n, --client-name=NÁZOV                Ako nazvať tohoto klienta na "
 "serveri\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2746,16 +3356,59 @@ msgid ""
 "Linked with libpulse %s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Neplatný názov prúdu „%s“"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr ""
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Zlyhalo otvorenie zvukového súboru."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Musíte určiť názov vzorky, ktorá sa má prehrať"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Musíte určiť názov vzorky, ktorá sa má odstrániť"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Musíte určiť číslo výstupu zdroja a zdroj"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Musíte určiť názov modulu a parametre."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Musíte určiť číslo modulu alebo názov"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr ""
@@ -2793,20 +3446,52 @@ msgid "You have to specify a module index or name"
 msgstr "Musíte určiť číslo modulu alebo názov"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Neplatná špecifikácia uspania."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Neplatná špecifikácia uspania."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr ""
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Musíte určiť názov cieľa"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Musíte určiť názov zdroja"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr ""
@@ -2828,19 +3513,51 @@ msgid "You have to specify a source name"
 msgstr "Musíte určiť názov zdroja"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Musíte určiť názov cieľa"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr ""
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Musíte určiť názov zdroja"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Musíte určiť názov/číslo zdroja a hlasitosť"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Musíte určiť číslo výstupu zdroja a hlasitosť"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Neplatné číslo výstupu zdroja"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Musíte určiť názov/číslo zdroja a hlasitosť"
@@ -2862,51 +3579,89 @@ msgid "Invalid source output index"
 msgstr "Neplatné číslo výstupu zdroja"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Neplatná špecifikácia stlmenia hlasitosti"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Neplatná špecifikácia stlmenia hlasitosti"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr ""
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr ""
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Neplatná špecifikácia čísla výstupu zdroja"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Neplatná špecifikácia čísla výstupu zdroja"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Musíte určiť číslo výstupu zdroja a hlasitosť"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -2914,6 +3669,17 @@ msgstr ""
 "Musíte určiť číslo cieľa a bodkočiarkami oddelený zoznam podporovaných "
 "formátov"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "Musíte určiť názov/číslo karty, názov portu a posunutie oneskorenia"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Nepodarilo sa analyzovať posun oneskorenia"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Musíte určiť názov/číslo karty, názov portu a posunutie oneskorenia"
@@ -2923,6 +3689,7 @@ msgid "Could not parse latency offset"
 msgstr "Nepodarilo sa analyzovať posun oneskorenia"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Nebol učený žiadny platný príkaz."
 
diff --git a/po/sr.po b/po/sr.po
index 246194fa9..40665a400 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:55+0000\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -178,10 +182,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail очекује логички аргумент"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level очекује аргумент за ниво записа (или нумеричка вредност у опсегу "
 "0..4 или једно од debug, info, notice, warn, error)."
@@ -605,7 +615,11 @@ msgid "Line In"
 msgstr "Линија у"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Микрофон"
 
@@ -628,12 +642,20 @@ msgid "Internal Microphone"
 msgstr "Унутрашњи микрофон"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Радио"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Видео"
 
@@ -672,12 +694,20 @@ msgid "No Bass Boost"
 msgstr "Без подизања"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Аналогне слушалице"
 
@@ -799,7 +829,11 @@ msgid "Stereo"
 msgstr "Стерео"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -807,6 +841,7 @@ msgstr ""
 #, fuzzy
 msgid "Speakerphone"
 msgstr "Аналогни стерео"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -894,6 +929,95 @@ msgstr ""
 msgid "Analog Mono Duplex"
 msgstr "Двосмерни аналогни моно"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "Аналогни окружујући 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "Аналогни окружујући 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "Аналогни окружујући 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "Аналогни окружујући 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "Аналогни окружујући 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "Аналогни окружујући 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "Аналогни окружујући 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "Аналогни окружујући 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "Аналогни окружујући 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "Аналогни окружујући 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "Аналогни окружујући 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "Дигитални стерео (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Дигитални окружујући 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Дигитални окружујући 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+#, fuzzy
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Дигитални окружујући 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "Дигитални стерео (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+#, fuzzy
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Дигитални окружујући 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "Двосмерни аналогни моно"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4733
 msgid "Analog Stereo Duplex"
 msgstr "Двосмерни аналогни стерео"
@@ -916,7 +1040,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Искључено"
 
@@ -930,7 +1058,11 @@ msgstr "Празан излаз"
 msgid "%s Input"
 msgstr "Улаз"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -947,7 +1079,11 @@ msgstr ""
 "Пробуђени смо са постављеним POLLOUT-ом -- али следећи snd_pcm_avail() је "
 "вратио 0 или неку другу вредност мању од min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1061,6 +1197,16 @@ msgstr[2] ""
 "Ово је највероватније грешка у „%s“ ALSA управљачком програму. Пријавите "
 "овај проблем ALSA програмерима."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1069,19 +1215,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "Аналогни излаз"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "Аналогне слушалице"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1099,15 +1273,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Репродукција високе тачности (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Снимање високе тачности (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1121,6 +1315,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1181,8 +1376,13 @@ msgstr ""
 "ladspa додатка> label=<ознака ladspa додатка> control=<списак улазних "
 "контролних вредности раздвојених зарезом>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1218,11 +1418,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Узорак NULL сливника"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Празан излаз"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Празан излаз"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Неуспешно добављање података о извору: %s"
@@ -1245,14 +1453,24 @@ msgstr "Аудио на @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1284,6 +1502,16 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Ко̑д грешке је непознат"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio звучни систем"
+
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr ""
@@ -1292,6 +1520,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr "PulseAudio звучни систем"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr "Предњи централни"
@@ -1467,6 +1696,87 @@ msgstr "Споредни 31"
 #: src/pulse/channelmap.c:154
 msgid "Top Center"
 msgstr "Горњи централни"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:156
+msgid "Top Front Center"
+msgstr "Горњи предњи централни"
+
+#: src/pulse/channelmap.c:157
+msgid "Top Front Left"
+msgstr "Горњи предњи леви"
+
+#: src/pulse/channelmap.c:158
+msgid "Top Front Right"
+msgstr "Горњи предњи десни"
+
+#: src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "Горњи позадински централни"
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "Горњи позадински леви"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "Горњи позадински десни"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(неисправно)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "Окружујући 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "Окружујући 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "Окружујући 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "Окружујући 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "Окружујући 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "Неуспела функција pa_context_connect(): %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "Неуспешно тумачење података из колачића"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "Примио поруку за непознати локал „%s“"
+
+=======
 
 #: src/pulse/channelmap.c:156
 msgid "Top Front Center"
@@ -1547,6 +1857,7 @@ msgstr "waitpid(): %s"
 msgid "Received message for unknown extension '%s'"
 msgstr "Примио поруку за непознати локал „%s“"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/direction.c:37
 #, fuzzy
 msgid "input"
@@ -1603,11 +1914,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] Неисправан циљни дневник „%s“."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Унутрашњи звук"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Унутрашњи звук"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Модем"
 
@@ -1883,7 +2202,11 @@ msgstr "Неуспешно исушивање тока: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Неуспела функција pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Неуспешно повезивање: %s"
@@ -2076,7 +2399,11 @@ msgstr ""
 "Компајлирано са libpulse %s\n"
 "Повезано са libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Неисправно име клијента „%s“"
@@ -2149,7 +2476,11 @@ msgstr ""
 "Упозорење: наведени параметри узорка ће бити пребрисани параметрима из "
 "датотеке."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Неуспешно утврђивање параметара узорка из датотеке."
 
@@ -2184,7 +2515,11 @@ msgstr "пушта"
 msgid "Failed to set media name."
 msgstr "Неуспешно тумачење командне линије."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Неуспела функција pa_mainloop_new()."
 
@@ -2192,11 +2527,19 @@ msgstr "Неуспела функција pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Неуспела функција io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Неуспела функција pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Неуспела функција pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Неуспела функција pa_context_connect(): %s"
@@ -2205,6 +2548,23 @@ msgstr "Неуспела функција pa_context_connect(): %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Неуспела функција pa_context_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Неуспела функција pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Неуспела функција pa_mainloop_run()."
@@ -2220,6 +2580,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2231,7 +2592,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2267,7 +2632,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2275,6 +2644,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2284,6 +2664,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2299,7 +2680,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2368,6 +2753,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+#, c-format
+msgid "Failed to get statistics: %s"
+msgstr "Неуспешно добављање статистике: %s"
+
+#: src/utils/pactl.c:181
+#, fuzzy, c-format
+msgid "Currently in use: %u block containing %s bytes total.\n"
+msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
+msgstr[0] "Тренутно у употреби: %u блокова садржи укупно %s бајтова.\n"
+msgstr[1] "Тренутно у употреби: %u блокова садржи укупно %s бајтова.\n"
+msgstr[2] "Тренутно у употреби: %u блокова садржи укупно %s бајтова.\n"
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "Смештено од покретања: %u блокова садржи укупно %s бајтова.\n"
+msgstr[1] "Смештено од покретања: %u блокова садржи укупно %s бајтова.\n"
+msgstr[2] "Смештено од покретања: %u блокова садржи укупно %s бајтова.\n"
+
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:183
 #, c-format
 msgid "Failed to get statistics: %s"
@@ -2391,21 +2801,34 @@ msgstr[1] "Смештено од покретања: %u блокова садр
 msgstr[2] "Смештено од покретања: %u блокова садржи укупно %s бајтова.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Величина кеш меморије узорка: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Неуспешно добављање података о серверу: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2416,7 +2839,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2439,6 +2866,21 @@ msgstr ""
 "Подразумевани извор: %s\n"
 "Колачић: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2452,19 +2894,67 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "Непозната наредба"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Линија у"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2502,17 +2992,27 @@ msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Аналогни моно"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Неуспешно добављање података о сливнику: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2551,37 +3051,66 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tПортови:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tАктивни порт: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tПортови:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Неуспешно добављање података о извору: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2620,6 +3149,17 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "непознато"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2629,11 +3169,16 @@ msgid "n/a"
 msgstr "непознато"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Неуспешно добављање података о модулу: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2650,12 +3195,20 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Неуспешно добављање података о клијенту: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2670,12 +3223,20 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Неуспешно добављање података о картици: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2692,45 +3253,77 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tПрофили:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tАктивни профил: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Неуспешно добављање података о улазу сливника: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2768,12 +3361,20 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Неуспешно добављање података о излазу извора: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2811,12 +3412,20 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Неуспешно добављање података о узорку: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2846,21 +3455,49 @@ msgstr ""
 "\tСвојства:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Неуспех: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "Неуспела функција read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2875,11 +3512,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Није успело постављање узорка: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2891,11 +3533,66 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Није успело постављање узорка: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Прерани крај датотеке"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Прерани крај датотеке"
@@ -2945,19 +3642,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "Сервер неисправан"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Добих SIGINT, излазим."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Неисправан параметар јачине"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Добих SIGINT, излазим."
@@ -2971,15 +3692,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "Неисправан параметар јачине"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "Неисправан параметар јачине"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -3025,6 +3798,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3032,7 +3806,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3054,7 +3832,11 @@ msgstr ""
 "повезати\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3065,16 +3847,55 @@ msgstr ""
 "Компајлирано са libpulse %s\n"
 "Повезано са libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Неисправно име тока „%s“"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Наведите датотеку узорка коју треба учитати"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Није успело отварање звучне датотеке."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Упозорење: Неуспешно утврђивање параметара узорка из датотеке."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Морате навести име узорка којег желите репродуковати"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Морате навести име узорка којег желите уклонити"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Морате навести индекс улаза сливника и сливник"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Морате навести индекс излаза извора и извор"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Морате навести име и аргументе модула."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Наведите датотеку узорка коју треба учитати"
@@ -3108,28 +3929,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "Морате навести име и аргументе модула."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "Морате навести индекс модула"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Не можете навести више од једног сливника. Морате навести логичку вредност."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "Неисправан параметар узорка"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "Не можете навести више од једног извора. Морате навести логичку вредност."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Морате навести име/индекс картице и име профила"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Морате навести име/индекс сливника и име порта"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Морате навести име/индекс картице и име профила"
@@ -3139,33 +3984,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "Морате навести име/индекс сливника и име порта"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "Морате навести име узорка којег желите репродуковати"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Морате навести име/индекс извора и име порта"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "Морате навести име/индекс извора и име порта"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "Морате навести индекс модула"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Морате навести име узорка којег желите репродуковати"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Морате навести име/индекс сливника и јачину"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Морате навести име/индекс сливника и јачину"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Морате навести индекс модула"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Морате навести име/индекс извора и јачину"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Морате навести индекс улаза сливника и јачину"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Неисправан индекс улаза сливника"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Морате навести име/индекс извора и јачину"
@@ -3179,83 +4060,141 @@ msgid "Invalid sink input index"
 msgstr "Неисправан индекс улаза сливника"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "Морате навести индекс излаза извора и извор"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "Неисправан индекс улаза сливника"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Морате навести име/индекс сливника и логичку вредност за искључивање"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "Неисправан параметар узорка"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Морате навести име/индекс извора и логичку вредност за искључивање"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "Морате навести индекс улаза сливника и логичку вредност за искључивање"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Неисправан параметар индекса улаза сливника"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Неисправан параметар индекса улаза сливника"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "Морате навести име/индекс извора и логичку вредност за искључивање"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "Неисправан параметар индекса улаза сливника"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Морате навести име/индекс сливника и име порта"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "Морате навести име/индекс сливника и логичку вредност за искључивање"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Морате навести име/индекс картице и име профила"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Није наведена исправна наредба."
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 414dac424..f8784aa32 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -9,7 +9,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:55+0000\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -178,10 +182,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail očekuje logički argument"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level očekuje argument za nivo zapisa (ili numerička vrednost u opsegu "
 "0..4 ili jedno od debug, info, notice, warn, error)."
@@ -606,7 +616,11 @@ msgid "Line In"
 msgstr "Linija u"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -629,12 +643,20 @@ msgid "Internal Microphone"
 msgstr "Unutrašnji mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -673,12 +695,20 @@ msgid "No Bass Boost"
 msgstr "Bez podizanja"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Analogne slušalice"
 
@@ -800,7 +830,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr ""
 
@@ -808,6 +842,7 @@ msgstr ""
 #, fuzzy
 msgid "Speakerphone"
 msgstr "Analogni stereo"
+<<<<<<< HEAD
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -895,6 +930,95 @@ msgstr ""
 msgid "Analog Mono Duplex"
 msgstr "Dvosmerni analogni mono"
 
+=======
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "Analogni okružujući 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "Analogni okružujući 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "Analogni okružujući 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "Analogni okružujući 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "Analogni okružujući 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "Analogni okružujući 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "Analogni okružujući 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "Analogni okružujući 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "Analogni okružujući 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "Analogni okružujući 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "Analogni okružujući 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "Digitalni stereo (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Digitalni okružujući 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Digitalni okružujući 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+#, fuzzy
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Digitalni okružujući 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "Digitalni stereo (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+#, fuzzy
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Digitalni okružujući 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "Dvosmerni analogni mono"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4733
 msgid "Analog Stereo Duplex"
 msgstr "Dvosmerni analogni stereo"
@@ -917,7 +1041,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Isključeno"
 
@@ -931,7 +1059,11 @@ msgstr "Prazan izlaz"
 msgid "%s Input"
 msgstr "Ulaz"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -948,7 +1080,11 @@ msgstr ""
 "Probuđeni smo sa postavljenim POLLOUT-om -- ali sledeći snd_pcm_avail() je "
 "vratio 0 ili neku drugu vrednost manju od min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1062,6 +1198,16 @@ msgstr[2] ""
 "Ovo je najverovatnije greška u „%s“ ALSA upravljačkom programu. Prijavite "
 "ovaj problem ALSA programerima."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1070,19 +1216,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "Analogni izlaz"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "Analogne slušalice"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1100,15 +1274,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "Reprodukcija visoke tačnosti (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "Snimanje visoke tačnosti (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1122,6 +1316,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1182,8 +1377,13 @@ msgstr ""
 "ladspa dodatka> label=<oznaka ladspa dodatka> control=<spisak ulaznih "
 "kontrolnih vrednosti razdvojenih zarezom>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1219,11 +1419,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Uzorak NULL slivnika"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Prazan izlaz"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Prazan izlaz"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Neuspešno dobavljanje podataka o izvoru: %s"
@@ -1246,14 +1454,24 @@ msgstr "Audio na @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1285,6 +1503,16 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Kȏd greške je nepoznat"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio zvučni sistem"
+
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr ""
@@ -1293,6 +1521,7 @@ msgstr ""
 msgid "PulseAudio Sound Server"
 msgstr "PulseAudio zvučni sistem"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr "Prednji centralni"
@@ -1468,6 +1697,87 @@ msgstr "Sporedni 31"
 #: src/pulse/channelmap.c:154
 msgid "Top Center"
 msgstr "Gornji centralni"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:156
+msgid "Top Front Center"
+msgstr "Gornji prednji centralni"
+
+#: src/pulse/channelmap.c:157
+msgid "Top Front Left"
+msgstr "Gornji prednji levi"
+
+#: src/pulse/channelmap.c:158
+msgid "Top Front Right"
+msgstr "Gornji prednji desni"
+
+#: src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "Gornji pozadinski centralni"
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "Gornji pozadinski levi"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "Gornji pozadinski desni"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(neispravno)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "Okružujući 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "Okružujući 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "Okružujući 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "Okružujući 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "Okružujući 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "Neuspela funkcija pa_context_connect(): %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "Neuspešno tumačenje podataka iz kolačića"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "Primio poruku za nepoznati lokal „%s“"
+
+=======
 
 #: src/pulse/channelmap.c:156
 msgid "Top Front Center"
@@ -1548,6 +1858,7 @@ msgstr "waitpid(): %s"
 msgid "Received message for unknown extension '%s'"
 msgstr "Primio poruku za nepoznati lokal „%s“"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/direction.c:37
 #, fuzzy
 msgid "input"
@@ -1604,11 +1915,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] Neispravan ciljni dnevnik „%s“."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Unutrašnji zvuk"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Unutrašnji zvuk"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1884,7 +2203,11 @@ msgstr "Neuspešno isušivanje toka: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Neuspela funkcija pa_stream_connect_record(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Neuspešno povezivanje: %s"
@@ -2078,7 +2401,11 @@ msgstr ""
 "Kompajlirano sa libpulse %s\n"
 "Povezano sa libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Neispravno ime klijenta „%s“"
@@ -2151,7 +2478,11 @@ msgstr ""
 "Upozorenje: navedeni parametri uzorka će biti prebrisani parametrima iz "
 "datoteke."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Neuspešno utvrđivanje parametara uzorka iz datoteke."
 
@@ -2186,7 +2517,11 @@ msgstr "pušta"
 msgid "Failed to set media name."
 msgstr "Neuspešno tumačenje komandne linije."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Neuspela funkcija pa_mainloop_new()."
 
@@ -2194,11 +2529,19 @@ msgstr "Neuspela funkcija pa_mainloop_new()."
 msgid "io_new() failed."
 msgstr "Neuspela funkcija io_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Neuspela funkcija pa_context_new()."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Neuspela funkcija pa_context_new()."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Neuspela funkcija pa_context_connect(): %s"
@@ -2207,6 +2550,23 @@ msgstr "Neuspela funkcija pa_context_connect(): %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "Neuspela funkcija pa_context_new()."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Neuspela funkcija pa_mainloop_run()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Neuspela funkcija pa_mainloop_run()."
@@ -2222,6 +2582,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2233,7 +2594,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2269,7 +2634,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2277,6 +2646,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2286,6 +2666,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2301,7 +2682,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2370,6 +2755,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+#, c-format
+msgid "Failed to get statistics: %s"
+msgstr "Neuspešno dobavljanje statistike: %s"
+
+#: src/utils/pactl.c:181
+#, fuzzy, c-format
+msgid "Currently in use: %u block containing %s bytes total.\n"
+msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
+msgstr[0] "Trenutno u upotrebi: %u blokova sadrži ukupno %s bajtova.\n"
+msgstr[1] "Trenutno u upotrebi: %u blokova sadrži ukupno %s bajtova.\n"
+msgstr[2] "Trenutno u upotrebi: %u blokova sadrži ukupno %s bajtova.\n"
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "Smešteno od pokretanja: %u blokova sadrži ukupno %s bajtova.\n"
+msgstr[1] "Smešteno od pokretanja: %u blokova sadrži ukupno %s bajtova.\n"
+msgstr[2] "Smešteno od pokretanja: %u blokova sadrži ukupno %s bajtova.\n"
+
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:183
 #, c-format
 msgid "Failed to get statistics: %s"
@@ -2393,21 +2803,34 @@ msgstr[1] "Smešteno od pokretanja: %u blokova sadrži ukupno %s bajtova.\n"
 msgstr[2] "Smešteno od pokretanja: %u blokova sadrži ukupno %s bajtova.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Veličina keš memorije uzorka: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Neuspešno dobavljanje podataka o serveru: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2418,7 +2841,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2441,6 +2868,21 @@ msgstr ""
 "Podrazumevani izvor: %s\n"
 "Kolačić: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2454,19 +2896,67 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "Nepoznata naredba"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "Linija u"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2504,17 +2994,27 @@ msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "Analogni mono"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Neuspešno dobavljanje podataka o slivniku: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2553,37 +3053,66 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortovi:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktivni port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tPortovi:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Neuspešno dobavljanje podataka o izvoru: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2622,6 +3151,17 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "nepoznato"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2631,11 +3171,16 @@ msgid "n/a"
 msgstr "nepoznato"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Neuspešno dobavljanje podataka o modulu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2652,12 +3197,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Neuspešno dobavljanje podataka o klijentu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2672,12 +3225,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Neuspešno dobavljanje podataka o kartici: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2694,45 +3255,77 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfili:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktivni profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Neuspešno dobavljanje podataka o ulazu slivnika: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2770,12 +3363,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Neuspešno dobavljanje podataka o izlazu izvora: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2813,12 +3414,20 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Neuspešno dobavljanje podataka o uzorku: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2848,21 +3457,49 @@ msgstr ""
 "\tSvojstva:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Neuspeh: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "Neuspela funkcija read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2877,11 +3514,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Nije uspelo postavljanje uzorka: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2893,11 +3535,66 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Nije uspelo postavljanje uzorka: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Prerani kraj datoteke"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Prerani kraj datoteke"
@@ -2947,19 +3644,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "Server neispravan"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Dobih SIGINT, izlazim."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Neispravan parametar jačine"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Dobih SIGINT, izlazim."
@@ -2973,15 +3694,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "Neispravan parametar jačine"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "Neispravan parametar jačine"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -3027,6 +3800,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3034,7 +3808,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3056,7 +3834,11 @@ msgstr ""
 "povezati\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3067,16 +3849,55 @@ msgstr ""
 "Kompajlirano sa libpulse %s\n"
 "Povezano sa libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "Neispravno ime toka „%s“"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Navedite datoteku uzorka koju treba učitati"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Nije uspelo otvaranje zvučne datoteke."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Upozorenje: Neuspešno utvrđivanje parametara uzorka iz datoteke."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Morate navesti ime uzorka kojeg želite reprodukovati"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Morate navesti ime uzorka kojeg želite ukloniti"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Morate navesti indeks ulaza slivnika i slivnik"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Morate navesti indeks izlaza izvora i izvor"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Morate navesti ime i argumente modula."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Navedite datoteku uzorka koju treba učitati"
@@ -3110,28 +3931,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "Morate navesti ime i argumente modula."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "Morate navesti indeks modula"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Ne možete navesti više od jednog slivnika. Morate navesti logičku vrednost."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "Neispravan parametar uzorka"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "Ne možete navesti više od jednog izvora. Morate navesti logičku vrednost."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Morate navesti ime/indeks kartice i ime profila"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Morate navesti ime/indeks slivnika i ime porta"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Morate navesti ime/indeks kartice i ime profila"
@@ -3141,33 +3986,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "Morate navesti ime/indeks slivnika i ime porta"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "Morate navesti ime uzorka kojeg želite reprodukovati"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Morate navesti ime/indeks izvora i ime porta"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "Morate navesti ime/indeks izvora i ime porta"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "Morate navesti indeks modula"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "Morate navesti ime uzorka kojeg želite reprodukovati"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Morate navesti ime/indeks slivnika i jačinu"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Morate navesti ime/indeks slivnika i jačinu"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "Morate navesti indeks modula"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Morate navesti ime/indeks izvora i jačinu"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Morate navesti indeks ulaza slivnika i jačinu"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Neispravan indeks ulaza slivnika"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Morate navesti ime/indeks izvora i jačinu"
@@ -3181,84 +4062,142 @@ msgid "Invalid sink input index"
 msgstr "Neispravan indeks ulaza slivnika"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "Morate navesti indeks izlaza izvora i izvor"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "Neispravan indeks ulaza slivnika"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Morate navesti ime/indeks slivnika i logičku vrednost za isključivanje"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "Neispravan parametar uzorka"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "Morate navesti ime/indeks izvora i logičku vrednost za isključivanje"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Morate navesti indeks ulaza slivnika i logičku vrednost za isključivanje"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Neispravan parametar indeksa ulaza slivnika"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Neispravan parametar indeksa ulaza slivnika"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "Morate navesti ime/indeks izvora i logičku vrednost za isključivanje"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "Neispravan parametar indeksa ulaza slivnika"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "Morate navesti ime/indeks slivnika i ime porta"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "Morate navesti ime/indeks slivnika i logičku vrednost za isključivanje"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Morate navesti ime/indeks kartice i ime profila"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Nije navedena ispravna naredba."
 
diff --git a/po/sv.po b/po/sv.po
index fdb8e36bd..1aafcfddd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -19,8 +19,13 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-05-04 16:02+0000\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-05-18 22:27+0000\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/sv/>\n"
@@ -29,7 +34,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.6.1\n"
+=======
 "X-Generator: Weblate 4.12.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -603,7 +612,11 @@ msgid "Line In"
 msgstr "Linje in"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -624,12 +637,20 @@ msgid "Internal Microphone"
 msgstr "Intern mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radio"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -666,12 +687,20 @@ msgid "No Bass Boost"
 msgstr "Ingen basökning"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Högtalare"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Hörlurar"
 
@@ -779,7 +808,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Headset"
 
@@ -892,7 +925,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Mono Chatt + 7.1 Surround"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Av"
 
@@ -906,7 +943,11 @@ msgstr "%s utgång"
 msgid "%s Input"
 msgstr "%s ingång"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -923,7 +964,11 @@ msgstr ""
 "We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
 "returned 0 or another value < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1022,6 +1067,64 @@ msgstr[1] ""
 "Förmodligen är detta ett fel i ALSA-drivrutinen ”%s”. Vänligen rapportera "
 "problemet till ALSA-utvecklarna."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth-ingång"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth-utgång"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Handsfree"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Hörlurar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Bärbar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Bil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "High fidelity playback (A2DP Sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "High fidelity capture (A2DP Source)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Headset-huvudenhet (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Headset audio gateway (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Handsfree-huvudenhet (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1078,6 +1181,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Handsfree-huvudenhet (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Handsfree audio gateway (HFP)"
 
@@ -1181,11 +1285,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Klockad NULL-mottagare"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Nullutgång"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Nullutgång"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Misslyckades med att ange format: ogiltig formatsträng %s"
@@ -1208,14 +1320,24 @@ msgstr "Ljud på @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Tunnel för %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Tunnel till %s/%s"
@@ -1246,7 +1368,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Okänd enhetsmodell"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "RAOP-standardprofil"
 
@@ -1563,11 +1689,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Ogiltigt mål för logg."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Inbyggt ljud"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Inbyggt ljud"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1842,7 +1976,11 @@ msgstr "Misslyckades med att ange övervakningsströmmen: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() misslyckades: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Anslutningsfel: %s"
@@ -1961,9 +2099,13 @@ msgstr ""
 "\n"
 "  -s, --server=SERVER                   Namn på servern att ansluta till\n"
 "  -d, --device=ENHET                    Namn på mottagare/källa att ansluta "
+<<<<<<< HEAD
+"till\n"
+=======
 "till. De speciella namnen @DEFAULT_SINK@, @DEFAULT_SOURCE@ och "
 "@DEFAULT_MONITOR@ kan användas för att ange standardmottagaren, -källan "
 "respektive -övervakaren.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -n, --client-name=NAMN                Hur denna klient ska namnges på "
 "servern\n"
 "      --stream-name=NAMN                Hur denna ström ska namnges på "
@@ -1972,7 +2114,11 @@ msgstr ""
 "intervallet 0…65536\n"
 "      --rate=SAMPLINGSFREKVENS          Samplingsfrekvens i Hz (standard "
 "44100)\n"
+<<<<<<< HEAD
+"      --format=SAMPLINGSFORMAT          Samplingsformat, se\n"
+=======
 "      --format=SAMPLINGSFORMAT            Samplingsformat, se\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "                                        https://www.freedesktop.org/wiki/"
 "Software/PulseAudio/Documentation/User/SupportedAudioFormats/\n"
 "                                        för möjliga värden (standard s16ne)\n"
@@ -1989,8 +2135,13 @@ msgstr ""
 "                                        ansluts till.\n"
 "      --fix-channels                    Ta antalet kanaler och "
 "kanalavbildning\n"
+<<<<<<< HEAD
+"                                        från mottagaren/källan strömmen är "
+"ansluten till.\n"
+=======
 "                                        från mottagaren/källan strömmen "
 "ansluts till.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "      --no-remix                        Mixa inte upp eller ner kanaler.\n"
 "      --no-remap                        Avbilda kanaler med index istället "
 "för med namn.\n"
@@ -2003,7 +2154,11 @@ msgstr ""
 "      --property=EGENSKAP=VÄRDE         Sätt angiven egenskap till angivet "
 "värde.\n"
 "      --raw                             Spela in/upp rå PCM-data.\n"
+<<<<<<< HEAD
+"      --passthrough                     Genomströmningsdata.\n"
+=======
 "      --passthrough                     Strömma data igenom.\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "      --file-format[=FFORMAT]           Spela in/upp formaterad PCM-data.\n"
 "      --list-file-formats               Lista tillgängliga filformat.\n"
 "      --monitor-stream=INDEX            Spela in från mottagaringången med "
@@ -2045,7 +2200,11 @@ msgstr ""
 "Kompilerade med libpulse %s\n"
 "Länkade med libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Ogiltigt klientnamn ”%s”"
@@ -2118,7 +2277,11 @@ msgstr ""
 "Varning: angiven samplingsspecifikation kommer att skrivas över med "
 "specifikation från filen."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Misslyckades med att avgöra samplingsspecifikation från filen."
 
@@ -2154,7 +2317,11 @@ msgstr "uppspelning"
 msgid "Failed to set media name."
 msgstr "Misslyckades med att ange medienamn."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() misslyckades."
 
@@ -2162,11 +2329,19 @@ msgstr "pa_mainloop_new() misslyckades."
 msgid "io_new() failed."
 msgstr "io_new() misslyckades."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() misslyckades."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() misslyckades."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() misslyckades: %s"
@@ -2175,6 +2350,23 @@ msgstr "pa_context_connect() misslyckades: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() misslyckades."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() misslyckades."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAMN [ARG …]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAMN|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() misslyckades."
@@ -2190,6 +2382,7 @@ msgstr "NAMN|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAMN"
 
@@ -2201,7 +2394,11 @@ msgstr "NAMN|#N VOLYM"
 msgid "#N VOLUME"
 msgstr "#N VOLYM"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAMN|#N 1|0"
 
@@ -2237,7 +2434,11 @@ msgstr "SÖKVÄGSNAMN"
 msgid "FILENAME SINK|#N"
 msgstr "FILNAMN MOTTAGARE|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N MOTTAGARE|KÄLLA"
 
@@ -2245,6 +2446,17 @@ msgstr "#N MOTTAGARE|KÄLLA"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KORT PROFIL"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAMN|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KORT PROFIL"
@@ -2254,6 +2466,7 @@ msgid "NAME|#N PORT"
 msgstr "NAMN|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "KORT-NAMN|KORT-#N PORT OFFSET"
 
@@ -2269,7 +2482,11 @@ msgstr "NUMERISK NIVÅ"
 msgid "FRAMES"
 msgstr "LJUDRUTOR"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "MOTTAGARE MEDDELANDE [MOTTAGARPARAMETRAR]"
 
@@ -2334,19 +2551,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Misslyckades med att hämta statistik: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Används för närvarande: %u block innehållande %s byte totalt.\n"
 msgstr[1] "Används för närvarande: %u block innehållande %s byte totalt.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2356,22 +2585,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Allokerade under hela livstiden: %u block innehållande %s byte totalt.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Samplingscachestorlek: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Misslyckades med att hämta serverinformation: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2388,7 +2634,11 @@ msgstr ""
 "Klientindex: %u\n"
 "Blockstorlek: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2411,6 +2661,74 @@ msgstr ""
 "Förvald källa: %s\n"
 "Kaka: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "tillgänglighet okänd"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "tillgänglig"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "inte tillgänglig"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Okänd"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Linje"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mik"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Lur"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Hörlur"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Blåtand"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Nätverk"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analog"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "tillgänglighet okänd"
@@ -2477,11 +2795,16 @@ msgstr "Analog"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Misslyckades med att få information om mottagare: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2520,37 +2843,66 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPortar:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (typ: %s, prioritet: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", tillgänglighetsgrupp: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", tillgänglighetsgrupp: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktiv port: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tFormat:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Misslyckades med att få information om källa: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2589,6 +2941,17 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "ej tillämpligt"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2598,11 +2961,16 @@ msgid "n/a"
 msgstr "ej tillämpligt"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Misslyckades med att få modulinformation: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2619,12 +2987,20 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Misslyckades med att få klientinformation: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2639,12 +3015,20 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Misslyckades med att få kortinformation: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2661,30 +3045,50 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfiler:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 "\t\t%s: %s (mottagare: %u, källor: %u, prioritet: %u, tillgängliga: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktiv profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 "\t\t%s: %s (typ: %s, prioritet: %u, latensavstånd: %<PRId64> µs%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2693,17 +3097,29 @@ msgstr ""
 "\t\t\tEgenskaper:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tDel av profil(er): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Misslyckades med att få ingångsinformation för mottagaren: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2742,12 +3158,20 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Misslyckades med att få information om källutgång: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2786,12 +3210,20 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Misslyckades med att få samplingsinformation: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2820,21 +3252,50 @@ msgstr ""
 "\tEgenskaper:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Misslyckande: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Att skicka ett meddelande misslyckades: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr "listhanterares meddelande misslyckades: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr "listhanterares meddelandesvar kunde inte tolkas korrekt"
+
+#: src/utils/pactl.c:951
+#, fuzzy
+msgid "list-handlers message response is not a JSON array"
+msgstr "listhanterares meddelandesvar kunde inte tolkas korrekt"
+
+#: src/utils/pactl.c:962
+#, fuzzy, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr "listhanterares meddelandesvar kunde inte tolkas korrekt"
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr "listhandlers-meddelandets svar kunde inte tolkas korrekt"
@@ -2850,11 +3311,16 @@ msgstr ""
 "listhanterares meddelandesvars vektorelement %d är inte ett JSON-objekt"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Misslyckades med att stänga modul: Modulen %s är inte aktiv"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2869,11 +3335,74 @@ msgstr[1] ""
 "Misslyckades att sätta volym: du försökte att sätta volymer för %d kanaler, "
 "medan antalet kanaler som stödjs = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Misslyckades med att skicka upp samplingen: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "För tidigt filslut"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "ny"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "ändra"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "ta bort"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "okänd"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "mottagare"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "källa"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "mottagaringång"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "källutgång"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "klient"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "sample-cache"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kort"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "För tidigt filslut"
@@ -2931,10 +3460,78 @@ msgid "card"
 msgstr "kort"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Händelse '%s' på %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Fick SIGINT, avslutar."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Ogiltig volymangivelse"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Volym utanför tillåtet intervall.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ogiltigt antal volymspecifikationer.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Inkonsekvent volymspecifikation.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[flaggor]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYP]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "FILNAMN [NAMN]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAMN [MOTTAGARE]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAMN|#N VOLYM [VOLYM …]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLYM [VOLYM …]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAMN|#N 1|0|växla"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|växla"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMAT"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Fick SIGINT, avslutar."
@@ -3000,6 +3597,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMAT"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3010,7 +3608,11 @@ msgstr ""
 "Specialnamnen @DEFAULT_SINK@, @DEFAULT_SOURCE och @DEFAULT_MONITOR@\n"
 "kan användas för att ange standardmottagare, källa och övervakare.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3033,7 +3635,11 @@ msgstr ""
 "  -s, --server=SERVER                   Namnet på servern att ansluta till\n"
 "  -n, --client-name=NAMN                Vad klienten ska kallas på servern\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3044,16 +3650,31 @@ msgstr ""
 "Kompilerad med libpulse %s\n"
 "Länkad med libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Ogiltigt formatvärde '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Specificera inget, eller endera av: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Ange en samplingsfil att ladda"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Misslyckades med att öppna ljudfilen."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Ange en samplingsfil att ladda"
@@ -3063,10 +3684,38 @@ msgid "Failed to open sound file."
 msgstr "Misslyckades med att öppna ljudfilen."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Varning: Misslyckades med att avgöra samplingsspecifikationen från filen."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Du måste ange ett samplingsnamn att spela"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Du måste ange ett samplingsnamn att ta bort"
+
+#: src/utils/pactl.c:2032
+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/utils/pactl.c:2042
+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/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Du måste ange ett modulnamn och argument."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Du måste ange ett modulindex eller namn"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Du måste ange ett samplingsnamn att spela"
@@ -3092,21 +3741,87 @@ msgid "You have to specify a module index or name"
 msgstr "Du måste ange ett modulindex eller namn"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 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."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Ogiltig avstängningsspecifikation."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Ogiltig avstängningsspecifikation."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 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."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+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/utils/pactl.c:2138
+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/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Du måste ange namn på en mottagare"
+
+#: src/utils/pactl.c:2162
+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/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Du måste ange namn på en källa"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Du måste ange namn på en mottagare"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Du måste ange ett mottagarnamn/-index och en volym"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Du måste ange namn på en källa"
+
+#: src/utils/pactl.c:2219
+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/utils/pactl.c:2232
+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/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Ogiltigt index för mottagaringång"
+
+#: src/utils/pactl.c:2248
+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/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Ogiltigt källutgångsindex"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Du måste ange ett kortnamn/-index och ett profilnamn"
@@ -3160,36 +3875,58 @@ msgid "Invalid source output index"
 msgstr "Ogiltigt källutgångsindex"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du måste ange en mottagarnamn/-index och ett dämpningsvärde (0, 1, eller "
 "”toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Ogiltig dämpningsspecifikation"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Ogiltig dämpningsspecifikation"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du måste ange ett källnamn/-index och ett dämpningsvärde (0, 1, eller "
 "”toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Du måste ange ett index för en mottagaringång och ett dämpningsvärde (0, 1, "
 "eller ”toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Ogiltig angivelse av index för mottagaringång"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Ogiltig angivelse av index för mottagaringång"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3197,6 +3934,17 @@ msgstr ""
 "Du måste ange ett källutgångsindex och ett dämpningsvärde (0, 1, eller "
 "”toggle”)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Ogiltig specificering av källutgångsindex"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "Du måste ange åtminstone en objektsökväg och ett meddelandenamn"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Ogiltig specificering av källutgångsindex"
@@ -3206,6 +3954,7 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Du måste ange åtminstone en objektsökväg och ett meddelandenamn"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
@@ -3213,7 +3962,11 @@ msgstr ""
 "Överflödiga argument givna, de kommer ignoreras. Observera att alla "
 "meddelandeparametrar måste ges som en enda sträng."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3221,6 +3974,17 @@ msgstr ""
 "Du måste ange ett mottagarindex och en semikolonavskild lista med format som "
 "stöds"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+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/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Kunde inte tolka latensoffset"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 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"
@@ -3230,6 +3994,7 @@ msgid "Could not parse latency offset"
 msgstr "Kunde inte tolka latensoffset"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Inget giltigt kommando angett."
 
diff --git a/po/ta.po b/po/ta.po
index 6025d3563..0c065ecf3 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.ta\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:56+0000\n"
 "Last-Translator: I. Felix <ifelix@redhat.com>\n"
 "Language-Team: Tamil <fedora-trans-ta@redhat.com>\n"
@@ -191,10 +195,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail பூலியன் அளவுரு எதிர்பார்க்கிறது"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level பதிவு நிலை அளவுருவை எதிர்பார்க்கிறது (எண் 0..4 அல்லது debug, info, "
 "notice, warn, errorஇல் ஒன்று)."
@@ -612,7 +622,11 @@ msgid "Line In"
 msgstr "லைன்இன்"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "மைக்ரோஃபோன்"
 
@@ -635,12 +649,20 @@ msgid "Internal Microphone"
 msgstr "உட்புற மைக்ரோஃபோன்"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "ரேடியோ"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "வீடியோ"
 
@@ -679,12 +701,20 @@ msgid "No Bass Boost"
 msgstr "பூஸ்ட் இல்லை"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "அனலாக் ஹெட்ஃபோன்கள்"
 
@@ -806,6 +836,45 @@ msgid "Stereo"
 msgstr "ஸ்டிரியோ"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+#, fuzzy
+msgid "Speakerphone"
+msgstr "அனலாக் ஸ்டிரியோ"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "Analog Surround 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "Analog Surround 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "Analog Surround 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "Analog Surround 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "Analog Surround 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "Analog Surround 5.0"
+
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
 msgid "Headset"
 msgstr ""
@@ -843,6 +912,7 @@ msgstr "Analog Surround 4.1"
 msgid "Analog Surround 5.0"
 msgstr "Analog Surround 5.0"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:4586
 msgid "Analog Surround 5.1"
 msgstr "Analog Surround 5.1"
@@ -923,7 +993,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "ஆஃப்"
 
@@ -937,7 +1011,11 @@ msgstr "பூஜ்ஜிய வெளிப்பாடு"
 msgid "%s Input"
 msgstr "உள்ளீடு"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -954,7 +1032,11 @@ msgstr ""
 "POLLOUT அமைவுடன் நாங்கள் எழுந்திருந்தோம்-- எப்படியிருந்தும் அடுத்தடுத்து "
 "snd_pcm_avail() r0 அல்லது வேறொரு மதிப்பு < min_avail திரும்பியது."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1053,6 +1135,16 @@ msgstr[1] ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1061,19 +1153,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "அனலாக் வெளிப்பாடு"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "அனலாக் ஹெட்ஃபோன்கள்"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1091,15 +1211,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "High Fidelity Playback (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "High Fidelity Capture (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1113,6 +1253,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1173,8 +1314,13 @@ msgstr ""
 "plugin name> label=<ladspa plugin label> control=<comma separated list of "
 "input control values>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1210,11 +1356,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "கடிகார பூஜ்ஜிய சிங்"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "பூஜ்ஜிய வெளிப்பாடு"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "பூஜ்ஜிய வெளிப்பாடு"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "மூலத்தின் தகவலை பெற இயலவில்லை: %s"
@@ -1237,14 +1391,24 @@ msgstr "@HOSTNAME@இல் ஆடியோ"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1276,7 +1440,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "தெரியாத பிழைக் குறியீடு"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1475,6 +1643,90 @@ msgstr "மேலே முன் வலது"
 #: src/pulse/channelmap.c:160
 msgid "Top Rear Center"
 msgstr "மேலே பின் நடுவில்"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "மேலே பின் இடது"
+
+#: src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "மேலே பின் வலது"
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(தவறான)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "Surround 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "Surround 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "Surround 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "Surround 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "Surround 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() தோல்வி: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "குக்கீ தரவை மாற்றுவதில் தோல்வியுற்றது"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "தெரியாத தொடரிச்சியிலிருந்து '%s'க்கு செய்திகள் பெறப்பட்டன"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "உள்ளீடு"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "பூஜ்ஜிய வெளிப்பாடு"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(தவறான)"
+
+=======
 
 #: src/pulse/channelmap.c:161
 msgid "Top Rear Left"
@@ -1558,6 +1810,7 @@ msgstr ""
 msgid "invalid"
 msgstr "(தவறான)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulsecore/core-util.c:1790
 #, c-format
 msgid ""
@@ -1595,11 +1848,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "[%s:%u] தவறான பதிவு இலக்கு '%s'."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "உட்புற ஆடியோ"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "உட்புற ஆடியோ"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "மாதிரி"
 
@@ -1875,7 +2136,11 @@ msgstr "ஸ்டீரிமை இழக்க முடியவில்ல
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() தோல்வியுற்றது: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "இணைப்பதில் தோல்வி: %s"
@@ -2069,7 +2334,11 @@ msgstr ""
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "தவறான கிளையன் பெயர் '%s'"
@@ -2141,7 +2410,11 @@ msgid ""
 msgstr ""
 "எச்சரிக்கை: கோப்பிலிருந்து குறிப்பீட்டுடன் குறிக்கிட்ட மாதிரி குறிப்பீடு மேலெழுதப்படலாம்."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "கோப்பிலிருந்து மாதிரி குறிப்பீட்டை  வரையறுக்க முடியவில்லை."
 
@@ -2177,7 +2450,11 @@ msgstr "பிண்ணனி"
 msgid "Failed to set media name."
 msgstr "கட்டளை வரியை மாற்றுவதில் தோல்வி."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() தோல்வி."
 
@@ -2185,11 +2462,19 @@ msgstr "pa_mainloop_new() தோல்வி."
 msgid "io_new() failed."
 msgstr "io_new() தோல்வியுற்றது."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() தோல்வி."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() தோல்வி."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() தோல்வி: %s"
@@ -2198,6 +2483,23 @@ msgstr "pa_context_connect() தோல்வி: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() தோல்வியுற்றது."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() தோல்வி."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() தோல்வி."
@@ -2213,6 +2515,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2224,7 +2527,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2260,7 +2567,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2268,6 +2579,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2277,6 +2599,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2292,7 +2615,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2359,19 +2686,31 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "புள்ளிவிவரத்தை பெற முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "தற்போது பயனிலுள்ளது: %u தொகுதிகள் %s பைட்களை மொத்தமாக கொண்டுள்ளது.\n"
 msgstr[1] "தற்போது பயனிலுள்ளது: %u தொகுதிகள் %s பைட்களை மொத்தமாக கொண்டுள்ளது.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2381,22 +2720,38 @@ msgstr[0] ""
 msgstr[1] ""
 "வாழ்க்கை முழுவதும் ஒதுக்கப்பட்டது: %u தொகுதிகள் %s பைட்களை மொத்தமாக கொண்டுள்ளது.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "மாதிரி இடையக அளவு: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "சேவையகத்தின் தகவலை பெற முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2407,7 +2762,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2430,6 +2789,21 @@ msgstr ""
 "முன்னிருப்பு மூலங்கள்: %s\n"
 "கூக்கி: %08x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2443,19 +2817,73 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "தெரியாத கட்டளை"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "லைன்இன்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "அனலாக் மோனோ"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
@@ -2499,11 +2927,16 @@ msgstr "அனலாக் மோனோ"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "சுருக்கமான தகவலை பெறு முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2542,37 +2975,66 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorts:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tசெயல்பாட்டிலுள்ள விவரக்குறிப்புகள்: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tPorts:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "மூலத்தின் தகவலை பெற இயலவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2611,6 +3073,17 @@ msgstr ""
 "\tபண்புகள்:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2620,11 +3093,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "தொகுதி தகவலை பெற முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2641,12 +3119,20 @@ msgstr ""
 "\tபண்புகள்:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "கிளையன்ட் தகவலை பெற முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2661,12 +3147,20 @@ msgstr ""
 "\tபண்புகள்:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "அட்டை தகவலை பெற முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2683,45 +3177,77 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tவிவரக்குறிப்புகள்:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tசெயல்பாட்டிலுள்ள விவரக்குறிப்புகள்: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "சிங்க் தகவலை பெற முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2759,12 +3285,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "மூல வெளிப்பாடு தகவலை பெற முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2802,12 +3336,20 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "மாதிரி தகவலை பெற முடியவில்லை.: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2837,21 +3379,49 @@ msgstr ""
 "\tProperties:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "தோல்வி: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "வாசிப்பதில்() தோல்வியுற்றது: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2866,11 +3436,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "மாதிரியை மேம்படுத்த முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2881,11 +3456,66 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "மாதிரியை மேம்படுத்த முடியவில்லை: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "முன்னாக கோப்பு முடித்தல்"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "முன்னாக கோப்பு முடித்தல்"
@@ -2935,19 +3565,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "தவறான புரவலன்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT பெறப்பட்டது, வெளியேறுகிறது."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "தவறான தொகுதி குறிப்பீடு"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT பெறப்பட்டது, வெளியேறுகிறது."
@@ -2961,15 +3615,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "தவறான தொகுதி குறிப்பீடு"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "தவறான தொகுதி குறிப்பீடு"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -3015,6 +3721,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3022,7 +3729,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3043,7 +3754,11 @@ msgstr ""
 "  -s, --சேவையகம்=SERVER                   பெயரிடப்பட்ட சேவையகம் இணைக்கப்பட வேண்டும்\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3054,16 +3769,55 @@ msgstr ""
 "Compiled with libpulse %s\n"
 "Linked with libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "தவறான ஸ்டீரீம் பெயர் '%s'."
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "ஏற்றுவதற்கு ஒரு மாதிரி கோப்பினை குறிப்பிடவும்"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "ஒலி கோப்பினை திறக்க முடியவில்லை."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "எச்சரிக்கை: கோப்பிலிருந்து மாதிரி குறிப்பீட்டை வரையறுக்க முடியவில்லை."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "இயக்கிவதற்கு நீங்கள் ஒரு மாதிரி பெயர் குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "நீக்குவதற்கு நீங்கள் ஒரு மாதிரி பெயர் குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "நீங்கள் ஒரு சிங்க் உள்ளீடு சுட்டி மற்றும் ஒரு சிங்கை குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "நீங்கள் ஒரு மூல வெளிப்பாடு சுட்டி மற்றும் ஒரு மூலத்தை குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "தொகுதி பெயர் மற்றும் விவாதங்களை நீங்கள் குறிப்பிட வேண்டும்."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "ஏற்றுவதற்கு ஒரு மாதிரி கோப்பினை குறிப்பிடவும்"
@@ -3097,28 +3851,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "தொகுதி பெயர் மற்றும் விவாதங்களை நீங்கள் குறிப்பிட வேண்டும்."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "தொகுதி அட்டவணையை நீங்கள் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "ஒரு சிங்கிற்கு மேல் நீங்கள் குறிப்பிடக் கூடாது. பூலியன் மதிப்பை நீங்கள் குறிப்பிட வேண்டும்."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "தவறான மாதிரி குறிப்பீடு"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "ஒரு மூலத்திற்கு மேல் நீங்கள் குறிப்பிடக் கூடாது. பூலியன் மதிப்பை நீங்கள் குறிப்பிட வேண்டும்."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "ஒரு அட்டை பெயர்/ முன்பக்கம் மற்றும் ஒரு விவரச்சீட்டு பெயர் நீங்கள் குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "நீங்கள் ஒரு சிங்க் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயரை குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "ஒரு அட்டை பெயர்/ முன்பக்கம் மற்றும் ஒரு விவரச்சீட்டு பெயர் நீங்கள் குறிப்பிட வேண்டும்"
@@ -3128,33 +3906,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "நீங்கள் ஒரு சிங்க் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயரை குறிப்பிட வேண்டும்"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "இயக்கிவதற்கு நீங்கள் ஒரு மாதிரி பெயர் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "ஒரு மூலப் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயர் நீங்கள் குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "ஒரு மூலப் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயர் நீங்கள் குறிப்பிட வேண்டும்"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "தொகுதி அட்டவணையை நீங்கள் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "இயக்கிவதற்கு நீங்கள் ஒரு மாதிரி பெயர் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "நீங்கள் ஒரு சிங்க் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயரை குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "நீங்கள் ஒரு சிங்க் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயரை குறிப்பிட வேண்டும்"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "தொகுதி அட்டவணையை நீங்கள் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "ஒரு மூலப் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயர் நீங்கள் குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "நீங்கள் ஒரு சிங்க் உள்ளீடு சுட்டி மற்றும் ஒரு சிங்கை குறிப்பிட வேண்டும்"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "தவறான சுருக்க உள்ளீடு அட்டவணை"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "ஒரு மூலப் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயர் நீங்கள் குறிப்பிட வேண்டும்"
@@ -3168,83 +3982,141 @@ msgid "Invalid sink input index"
 msgstr "தவறான சுருக்க உள்ளீடு அட்டவணை"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "நீங்கள் ஒரு மூல வெளிப்பாடு சுட்டி மற்றும் ஒரு மூலத்தை குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "தவறான சுருக்க உள்ளீடு அட்டவணை"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "நீங்கள் ஒரு சிங்க் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயரை குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "தவறான மாதிரி குறிப்பீடு"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "ஒரு மூலப் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயர் நீங்கள் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "நீங்கள் ஒரு சிங்க் உள்ளீடு சுட்டி மற்றும் ஒரு சிங்கை குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "தவறான சுருக்க உள்ளீடு அட்டவணை குறிப்பீடு"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "தவறான சுருக்க உள்ளீடு அட்டவணை குறிப்பீடு"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "ஒரு மூலப் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயர் நீங்கள் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "தவறான சுருக்க உள்ளீடு அட்டவணை குறிப்பீடு"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "நீங்கள் ஒரு சிங்க் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயரை குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "நீங்கள் ஒரு சிங்க் பெயர்/ முன்பக்கம் மற்றும் ஒரு துறைப் பெயரை குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "ஒரு அட்டை பெயர்/ முன்பக்கம் மற்றும் ஒரு விவரச்சீட்டு பெயர் நீங்கள் குறிப்பிட வேண்டும்"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "சரியான கட்டளை குறிப்பிடபடவில்லை"
 
diff --git a/po/te.po b/po/te.po
index 8bec442b0..512090f8c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,7 +8,11 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx.te\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2012-01-30 09:56+0000\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
@@ -177,10 +181,16 @@ msgid "--fail expects boolean argument"
 msgstr "--fail బూలియన్ ఆర్గుమెంటును కోరుకుంటుంది"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+msgid ""
+"--log-level expects log level argument (either numeric in range 0..4 or one "
+"of debug, info, notice, warn, error)."
+=======
 #, fuzzy
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgstr ""
 "--log-level లాగ్ స్థాయి ఆర్గుమెంట్‌ను కోరుకుంటోంది (సహజసంఖ్యను 0..4 విస్తృతిలో కాని లేదా డీబగ్‌, "
 "సమాచారము, నోటీసు, హెచ్చరిక, దోషము వీటిలో వొకటికాని)."
@@ -595,7 +605,11 @@ msgid "Line In"
 msgstr "లైన్-యిన్"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "మైక్రోఫోన్"
 
@@ -618,12 +632,20 @@ msgid "Internal Microphone"
 msgstr "అంతర్గత మైక్రోఫోన్"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "రేడియో"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "వీడియో"
 
@@ -662,12 +684,20 @@ msgid "No Bass Boost"
 msgstr "బూస్ట్ లేదు"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "ఎనలాగ్ హెడ్‌ఫోన్స్"
 
@@ -783,6 +813,258 @@ msgstr "ఎనలాగ్ స్టీరియో"
 #: src/pulse/channelmap.c:770
 msgid "Mono"
 msgstr "మోనో"
+<<<<<<< HEAD
+
+#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
+msgid "Stereo"
+msgstr "స్టీరియో"
+
+#: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+msgid "Headset"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+#, fuzzy
+msgid "Speakerphone"
+msgstr "ఎనలాగ్ స్టీరియో"
+
+#: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
+msgid "Multichannel"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4580
+msgid "Analog Surround 2.1"
+msgstr "ఎనలాగ్ సరౌండ్ 2.1"
+
+#: src/modules/alsa/alsa-mixer.c:4581
+msgid "Analog Surround 3.0"
+msgstr "ఎనలాగ్ సరౌండ్ 3.0"
+
+#: src/modules/alsa/alsa-mixer.c:4582
+msgid "Analog Surround 3.1"
+msgstr "ఎనలాగ్ సరౌండ్ 3.1"
+
+#: src/modules/alsa/alsa-mixer.c:4583
+msgid "Analog Surround 4.0"
+msgstr "ఎనలాగ్ సరౌండ్ 4.0"
+
+#: src/modules/alsa/alsa-mixer.c:4584
+msgid "Analog Surround 4.1"
+msgstr "ఎనలాగ్ సరౌండ్ 4.1"
+
+#: src/modules/alsa/alsa-mixer.c:4585
+msgid "Analog Surround 5.0"
+msgstr "ఎనలాగ్ సరౌండ్ 5.0"
+
+#: src/modules/alsa/alsa-mixer.c:4586
+msgid "Analog Surround 5.1"
+msgstr "ఎనలాగ్ సరౌండ్ 5.1"
+
+#: src/modules/alsa/alsa-mixer.c:4587
+msgid "Analog Surround 6.0"
+msgstr "ఎనలాగ్ సరౌండ్ 6.0"
+
+#: src/modules/alsa/alsa-mixer.c:4588
+msgid "Analog Surround 6.1"
+msgstr "ఎనలాగ్ సరౌండ్ 6.1"
+
+#: src/modules/alsa/alsa-mixer.c:4589
+msgid "Analog Surround 7.0"
+msgstr "ఎనలాగ్ సరౌండ్ 7.0"
+
+#: src/modules/alsa/alsa-mixer.c:4590
+msgid "Analog Surround 7.1"
+msgstr "ఎనలాగ్ సరౌండ్ 7.1"
+
+#: src/modules/alsa/alsa-mixer.c:4591
+msgid "Digital Stereo (IEC958)"
+msgstr "డిజిటల్ స్టీరియో (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "డిజిటల్ సరౌండ్ 4.0 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "డిజిటల్ సరౌండ్ 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4594
+#, fuzzy
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "డిజిటల్ సరౌండ్ 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr "డిజిటల్ స్టీరియో (HDMI)"
+
+#: src/modules/alsa/alsa-mixer.c:4596
+#, fuzzy
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "డిజిటల్ సరౌండ్ 5.1 (IEC958/AC3)"
+
+#: src/modules/alsa/alsa-mixer.c:4597
+msgid "Chat"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4732
+msgid "Analog Mono Duplex"
+msgstr "ఎనలాగ్ మోనో డుప్లెక్స్"
+
+#: src/modules/alsa/alsa-mixer.c:4733
+msgid "Analog Stereo Duplex"
+msgstr "ఎనలాగ్ స్టీరియో డుప్లెక్స్"
+
+#: src/modules/alsa/alsa-mixer.c:4736
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "డిజిటల్ స్టీరియో డుప్లెక్స్ (IEC958)"
+
+#: src/modules/alsa/alsa-mixer.c:4737
+msgid "Multichannel Duplex"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4738
+#, fuzzy
+msgid "Stereo Duplex"
+msgstr "ఎనలాగ్ స్టీరియో డుప్లెక్స్"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+msgid "Off"
+msgstr "ఆఫ్"
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, fuzzy, c-format
+msgid "%s Output"
+msgstr "Null అవుట్పుట్"
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, fuzzy, c-format
+msgid "%s Input"
+msgstr "ఇన్పుట్"
+
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+#, fuzzy, 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 ""
+"ALSA కొత్త డాటాను పరికరముకు వ్రాయుటకు మనలను జాగరూక పరిచింది, అయితే అక్కడ వాస్తవంగా వ్రాయుటకు యేమి "
+"లేదు!\n"
+"సాదారణం యిది ALSA డ్రైవర్ %s నందు బగ్ కావచ్చును. దయచేసి దీనిని ALSA అభివృద్దికారులకు తెలియపరచండి.\n"
+"మనము POLLOUT అమర్పు ద్వారా జాగరూక పరచబడినాము -- ఏమైనప్పటికి snd_pcm_avail() అనునది 0 ను "
+"యిస్తుంది లేదా వేరొక విలువ < min_avail యిస్తుంది."
+
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+#, fuzzy, 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 ""
+"ALSA కొత్త డాటాను పరికరమునుండి చదువుటకు మనలను జాగరూక పరిచింది, అయితే అక్కడ వాస్తవంగా "
+"చదువుటకు యేమి లేదు!\n"
+"సాదారణం యిది ALSA డ్రైవర్ %s నందు బగ్ కావచ్చును. దయచేసి దీనిని ALSA అభివృద్దికారులకు తెలియపరచండి.\n"
+"మనము POLLOUT అమర్పు ద్వారా జాగరూక పరచబడినాము -- ఏమైనప్పటికి snd_pcm_avail() అనునది 0 ను "
+"యిస్తుంది లేదా వేరొక విలువ < min_avail యిస్తుంది."
+
+#: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_avail() అనునది పెద్ద విలువను యిచ్చినది: %lu bytes (%lu ms).\n"
+"సాదారణంగా యిది ALSA డ్రైవర్ '%s' నందలి బగ్ కావచ్చును. దయచేసి దీనిని ALSA అభివృద్ది కారులకు "
+"నివేదించుము."
+msgstr[1] ""
+"snd_pcm_avail() అనునది పెద్ద విలువను యిచ్చినది: %lu bytes (%lu ms).\n"
+"సాదారణంగా యిది ALSA డ్రైవర్ '%s' నందలి బగ్ కావచ్చును. దయచేసి దీనిని ALSA అభివృద్ది కారులకు "
+"నివేదించుము."
+
+#: src/modules/alsa/alsa-util.c:1249
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_delay() అనునది పెద్ద విలువను యిచ్చినది: %li bytes (%s%lu ms).\n"
+"సాదారణంగా యిది ALSA డ్రైవర్ '%s' నందు బగ్ కావచ్చును . దయచేసి దీనిని ALSA అభివృద్దికారులక "
+"నివేదించుము."
+msgstr[1] ""
+"snd_pcm_delay() అనునది పెద్ద విలువను యిచ్చినది: %li bytes (%s%lu ms).\n"
+"సాదారణంగా యిది ALSA డ్రైవర్ '%s' నందు బగ్ కావచ్చును . దయచేసి దీనిని ALSA అభివృద్దికారులక "
+"నివేదించుము."
+
+#: src/modules/alsa/alsa-util.c:1296
+#, fuzzy, 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 ""
+"snd_pcm_avail() అనునది పెద్ద విలువను యిచ్చినది: %lu bytes (%lu ms).\n"
+"సాదారణంగా యిది ALSA డ్రైవర్ '%s' నందలి బగ్ కావచ్చును. దయచేసి దీనిని ALSA అభివృద్ది కారులకు "
+"నివేదించుము."
+
+#: src/modules/alsa/alsa-util.c:1339
+#, fuzzy, c-format
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgid_plural ""
+"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[0] ""
+"snd_pcm_mmap_begin() అనునది పెద్ద విలువను యిచ్చినది: %lu bytes (%lu ms).\n"
+"సాదారణంగా యిది ALSA డ్రైవర్ '%s'నందలి బగ్ కావచ్చును. దయచేసి దీనిని ALSA అభివృద్దికారులను నివేదించండి."
+msgstr[1] ""
+"snd_pcm_mmap_begin() అనునది పెద్ద విలువను యిచ్చినది: %lu bytes (%lu ms).\n"
+"సాదారణంగా యిది ALSA డ్రైవర్ '%s'నందలి బగ్ కావచ్చును. దయచేసి దీనిని ALSA అభివృద్దికారులను నివేదించండి."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+=======
 
 #: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
 msgid "Stereo"
@@ -1033,19 +1315,47 @@ msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1938
 #: src/modules/bluetooth/module-bluez5-device.c:1957
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth Output"
 msgstr "ఎనలాగ్ అవుట్పుట్"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
 msgid "Handsfree"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:1971
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Headphone"
 msgstr "ఎనలాగ్ హెడ్‌ఫోన్స్"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
 msgid "Portable"
 msgstr ""
@@ -1063,15 +1373,35 @@ msgid "Phone"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2042
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "హై ఫెడిలిటి ప్లేబ్యాక్ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2054
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "హై ఫెడిలిటి కాప్చర్ (A2DP)"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2066
 msgid "Headset Head Unit (HSP)"
 msgstr ""
@@ -1085,6 +1415,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr ""
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr ""
 
@@ -1143,8 +1474,13 @@ msgstr ""
 "channel_map=<చానల్ మాప్> plugin=<ladspa ప్లగిన్ నామము> label=<ladspa ప్లగిన్ లేబుల్> "
 "control=<ఇన్పుట్ నియంత్రణ విలువలయొక్క జాబితా>"
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr ""
@@ -1179,11 +1515,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "NULL సింక్ క్లాక్‌చేయబడింది"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null అవుట్పుట్"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null అవుట్పుట్"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "మూలము సమాచారము పొందుటకు విఫలమైంది: %s"
@@ -1206,14 +1550,24 @@ msgstr "@HOSTNAME@ పై ఆడియో"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr ""
@@ -1244,7 +1598,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "తెలియని దోషము కోడ్"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr ""
 
@@ -1451,6 +1809,82 @@ msgstr "పైన వెనుక ఎడమవైపు"
 #: src/pulse/channelmap.c:162
 msgid "Top Rear Right"
 msgstr "పైన వెనుక కుడివైపున"
+<<<<<<< HEAD
+
+#: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
+#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+msgid "(invalid)"
+msgstr "(చెల్లని)"
+
+#: src/pulse/channelmap.c:779
+msgid "Surround 4.0"
+msgstr "సరౌండ్ 4.0"
+
+#: src/pulse/channelmap.c:785
+msgid "Surround 4.1"
+msgstr "సరౌండ్ 4.1"
+
+#: src/pulse/channelmap.c:791
+msgid "Surround 5.0"
+msgstr "సరౌండ్ 5.0"
+
+#: src/pulse/channelmap.c:797
+msgid "Surround 5.1"
+msgstr "సరౌండ్ 5.1"
+
+#: src/pulse/channelmap.c:804
+msgid "Surround 7.1"
+msgstr "సరౌండ్ 7.1"
+
+#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#, fuzzy
+msgid "xcb_connect() failed"
+msgstr "pa_context_connect() విఫలమైంది: %s"
+
+#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr ""
+
+#: src/pulse/client-conf-x11.c:102
+msgid "Failed to parse cookie data"
+msgstr "కుకీ డాటా పార్శ్ చేయుటకు విఫలమైంది"
+
+#: src/pulse/context.c:717
+#, c-format
+msgid "fork(): %s"
+msgstr "fork(): %s"
+
+#: src/pulse/context.c:772
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: src/pulse/context.c:1488
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "తెలియని పొడిగింపు కొరకు సందేశము స్వీకరించింది '%s'"
+
+#: src/pulse/direction.c:37
+#, fuzzy
+msgid "input"
+msgstr "ఇన్పుట్"
+
+#: src/pulse/direction.c:39
+#, fuzzy
+msgid "output"
+msgstr "Null అవుట్పుట్"
+
+#: src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr ""
+
+#: src/pulse/direction.c:43
+#, fuzzy
+msgid "invalid"
+msgstr "(చెల్లని)"
+
+=======
 
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
@@ -1526,6 +1960,7 @@ msgstr ""
 msgid "invalid"
 msgstr "(చెల్లని)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulsecore/core-util.c:1790
 #, c-format
 msgid ""
@@ -1533,6 +1968,46 @@ 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 ""
+<<<<<<< HEAD
+
+#: src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr ""
+
+#: src/pulsecore/core-util.h:97
+#, fuzzy
+msgid "no"
+msgstr "మోనో"
+
+#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "ఆటోస్పాన్ తాళంను యాక్సిస్ చేయలేదు."
+
+#: src/pulsecore/log.c:165
+#, fuzzy, c-format
+msgid "Failed to open target file '%s'."
+msgstr "ఆడియో ఫైలును తెరువుటకు విఫలమైంది."
+
+#: src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+
+#: src/pulsecore/log.c:651
+#, fuzzy
+msgid "Invalid log target."
+msgstr "[%s:%u] చెల్లని లాగ్ లక్ష్యము '%s'."
+
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "అంతర్గత ఆడియో"
+
+#: src/pulsecore/sink.c:3544
+msgid "Modem"
+msgstr "మోడెమ్"
+
+=======
 
 #: src/pulsecore/core-util.h:97
 msgid "yes"
@@ -1571,6 +2046,7 @@ msgstr "అంతర్గత ఆడియో"
 msgid "Modem"
 msgstr "మోడెమ్"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/pulse/error.c:38
 msgid "OK"
 msgstr "సరే"
@@ -1843,7 +2319,11 @@ msgstr "స్ట్రీమ్‌ను డ్రైయిన్ చేయు
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "అనుసంధానము వైఫల్యము: %s"
@@ -2037,7 +2517,11 @@ msgstr ""
 "libpulse తో నిర్వర్తించబడింది %s\n"
 "libpulse లింకైనది %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "చెల్లని కక్షిదారి నామము '%s'"
@@ -2108,7 +2592,11 @@ msgid ""
 "specification from file."
 msgstr "హెచ్చరిక: తెలుపబడిన మాదిరి విశదీకరణ దస్త్రమునుండి వచ్చు విశదీకరణతో తిరిగివ్రాయబడుతుంది."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "దస్త్రమునుండి మాదిరి విశదీకరణను నిర్ధారించుటలో విఫలమైంది."
 
@@ -2143,7 +2631,11 @@ msgstr "ప్లేబాక్"
 msgid "Failed to set media name."
 msgstr "ఆదేశ వరుసను పార్శ్ చేయుటకు విఫలమైంది."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() విఫలమైంది."
 
@@ -2151,11 +2643,19 @@ msgstr "pa_mainloop_new() విఫలమైంది."
 msgid "io_new() failed."
 msgstr "io_new() విఫలమైంది."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() విఫలమైంది."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() విఫలమైంది."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() విఫలమైంది: %s"
@@ -2164,6 +2664,23 @@ msgstr "pa_context_connect() విఫలమైంది: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() విఫలమైంది."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() విఫలమైంది."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr ""
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() విఫలమైంది."
@@ -2179,6 +2696,7 @@ msgstr ""
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr ""
 
@@ -2190,7 +2708,11 @@ msgstr ""
 msgid "#N VOLUME"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr ""
 
@@ -2226,7 +2748,11 @@ msgstr ""
 msgid "FILENAME SINK|#N"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr ""
 
@@ -2234,6 +2760,17 @@ msgstr ""
 msgid "1|0"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr ""
@@ -2243,6 +2780,7 @@ msgid "NAME|#N PORT"
 msgstr ""
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr ""
 
@@ -2258,7 +2796,11 @@ msgstr ""
 msgid "FRAMES"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2302,11 +2844,19 @@ msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 #, c-format
 msgid "connect(): %s"
 msgstr "connect(): %s"
+<<<<<<< HEAD
 
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
 msgstr "PulseAudio డెమోన్ నాశనం చేయుటలో విఫలమైంది."
 
+=======
+
+#: src/utils/pacmd.c:173
+msgid "Failed to kill PulseAudio daemon."
+msgstr "PulseAudio డెమోన్ నాశనం చేయుటలో విఫలమైంది."
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/utils/pacmd.c:181
 msgid "Daemon not responding."
 msgstr "డెమోన్ స్పందించుటలేదు."
@@ -2326,17 +2876,37 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "గణాంకాలను పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "ప్రస్తుతం వుపయోగంలోవుంది: %u బ్లాక్‌లు %s బైట్లను మొత్తంగా కలిగి వున్నాయి.\n"
 msgstr[1] "ప్రస్తుతం వుపయోగంలోవుంది: %u బ్లాక్‌లు %s బైట్లను మొత్తంగా కలిగి వున్నాయి.\n"
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:187
+#, fuzzy, c-format
+msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
+msgid_plural ""
+"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr[0] "మొత్తం లైఫ్‌టైములో కేటాయించబడింది: %u బ్లాకులు %s బైట్లను మొత్తంగా కలిగివున్నాయి.\n"
+msgstr[1] "మొత్తం లైఫ్‌టైములో కేటాయించబడింది: %u బ్లాకులు %s బైట్లను మొత్తంగా కలిగివున్నాయి.\n"
+
+#: src/utils/pactl.c:193
+=======
 
 #: src/utils/pactl.c:205
 #, fuzzy, c-format
@@ -2347,21 +2917,34 @@ msgstr[0] "మొత్తం లైఫ్‌టైములో కేటాయ
 msgstr[1] "మొత్తం లైఫ్‌టైములో కేటాయించబడింది: %u బ్లాకులు %s బైట్లను మొత్తంగా కలిగివున్నాయి.\n"
 
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "మాదిరి క్యాచి పరిమాణము: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "సేవిక సమాచారమును పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2372,7 +2955,11 @@ msgid ""
 "Tile Size: %zu\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "User Name: %s\n"
@@ -2384,6 +2971,88 @@ msgid ""
 "Default Sink: %s\n"
 "Default Source: %s\n"
 "Cookie: %04x:%04x\n"
+<<<<<<< HEAD
+msgstr ""
+"వినియోగదారి నామము: %s\n"
+"హోస్టు నామము: %s\n"
+"సేవిక నామము: %s\n"
+"సేవిక వర్షన్: %s\n"
+"అప్రమేయ మాదిరి విశదీకరణ: %s\n"
+"అప్రమేయ ప్రసారమార్గ మాప్: %s\n"
+"అప్రమేయ సింకు: %s\n"
+"అప్రమేయ మూలము: %s\n"
+"కుకీ: %08x\n"
+
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+#, fuzzy
+msgid "Unknown"
+msgstr "తెలియని ఆదేశము"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+#, fuzzy
+msgid "Line"
+msgstr "లైన్-యిన్"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+#, fuzzy
+msgid "Analog"
+msgstr "ఎనలాగ్ మోనో"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 msgstr ""
 "వినియోగదారి నామము: %s\n"
 "హోస్టు నామము: %s\n"
@@ -2464,11 +3133,16 @@ msgstr "ఎనలాగ్ మోనో"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "సింక్ సమాచారమును పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink #%u\n"
@@ -2507,37 +3181,66 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tపోర్టులు:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tక్రియాశీల పోర్టు: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\tFormats:\n"
 msgstr "\tపోర్టులు:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "మూలము సమాచారము పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source #%u\n"
@@ -2576,6 +3279,17 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "వర్తించదు"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2585,11 +3299,16 @@ msgid "n/a"
 msgstr "వర్తించదు"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "మాడ్యూల్ సమాచారము పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2606,12 +3325,20 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "కక్షిదారి సమాచారము పొందుటలో విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2626,12 +3353,20 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "కార్డు సమాచారము పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2648,45 +3383,77 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tప్రోఫైల్సు:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tక్రియాశీల ప్రొఫైల్: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
 "\t\t\t\t%s\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "సింక్ ఇన్పుట్ సమాచారము పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2724,12 +3491,20 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "మూలపు అవుట్పుట్ సమాచారము పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2767,12 +3542,20 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "మాదిరి సమాచారము పొందుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Sample #%u\n"
@@ -2802,21 +3585,44 @@ msgstr ""
 "\tలక్షణాలు:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "వైఫైల్యము: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2826,16 +3632,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "మాదిరి అప్‌లోడు చేయుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2846,11 +3661,66 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "మాదిరి అప్‌లోడు చేయుటకు విఫలమైంది: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "దస్త్రము యొక్క అపరిపక్వ ముగింపు"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:1415
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "దస్త్రము యొక్క అపరిపక్వ ముగింపు"
@@ -2900,19 +3770,43 @@ msgid "sample-cache"
 msgstr ""
 
 #: src/utils/pactl.c:2182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "server"
 msgstr "చెల్లని సేవిక"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr ""
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2185
 msgid "card"
 msgstr ""
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT పొందింది, నిష్క్రమించుచున్నది."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "చెల్లనటువంటి వాల్యూమ్ విశదీకరణ"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:1798
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT పొందింది, నిష్క్రమించుచున్నది."
@@ -2926,15 +3820,67 @@ msgid "Volume outside permissible range.\n"
 msgstr ""
 
 #: src/utils/pactl.c:2594
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid number of volume specifications.\n"
 msgstr "చెల్లనటువంటి వాల్యూమ్ విశదీకరణ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1810
+=======
 #: src/utils/pactl.c:2606
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Inconsistent volume specification.\n"
 msgstr "చెల్లనటువంటి వాల్యూమ్ విశదీకరణ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2636 src/utils/pactl.c:2637 src/utils/pactl.c:2638
 #: src/utils/pactl.c:2639 src/utils/pactl.c:2640 src/utils/pactl.c:2641
 #: src/utils/pactl.c:2642 src/utils/pactl.c:2643 src/utils/pactl.c:2644
@@ -2980,6 +3926,7 @@ msgid "#N FORMATS"
 msgstr ""
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2987,7 +3934,11 @@ msgid ""
 "can be used to specify the default sink, source and monitor.\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3009,7 +3960,11 @@ msgstr ""
 "to\n"
 "\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3020,16 +3975,55 @@ msgstr ""
 "libpulse తో నిర్వర్తించబడింది%s\n"
 "libpulse తో లింకుచేయబడింది %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "చెల్లని స్ట్రీమ్ నామము '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "లోడువ్వుటకు దయచేసి మాదిరి దస్త్రమును తెలుపుము"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "శబ్దపు దస్త్రమును తెరువుటకు విఫలమైంది."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "హెచ్చరిక: దస్త్రమునుండి మాదిరి విశదీకరణను నిర్ణయించుటకు విఫలమైంది."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "ప్లే చేయుటకు మీరు మాదిరి నామమును తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "తొలగించుటకు మీరు మాదిరి నామమును తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "మీరు సింక్ ఇన్పుట్ విషయసూచిక మరియు సింక్ తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "మీరు మూలము అవుట్పుట్ విషయసూచిక మరియు మూలము తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "మీరు మాడ్యూల్ నామము మరియు ఆర్గుమెంట్లు తెలుపవలసి వుంది."
+
+#: src/utils/pactl.c:2077
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "లోడువ్వుటకు దయచేసి మాదిరి దస్త్రమును తెలుపుము"
@@ -3063,28 +4057,52 @@ msgid "You have to specify a module name and arguments."
 msgstr "మీరు మాడ్యూల్ నామము మరియు ఆర్గుమెంట్లు తెలుపవలసి వుంది."
 
 #: src/utils/pactl.c:2889
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a module index or name"
 msgstr "మీరు మాడ్యూల్ విషయసూచిక తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "మీరు వొక సింకు కన్నా యెక్కువ తెలుపవలసి వుండకపోవచ్చు. మీరు బూలియన్ విలువను తెలుపవలసి వుంది."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid suspend specification."
 msgstr "చెల్లనటువంటి మాదిరి విశదీకరణ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr ""
 "మీరు వొక మూలము కన్నా యెక్కువ తెలుపవలసి వుండకపోవచ్చు. మీరు బూలియన్ విలువను తెలుపవలసి వుంది."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "మీరు కార్డ్ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "మీరు సింక్‌ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2149
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "మీరు కార్డ్ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
@@ -3094,33 +4112,69 @@ msgid "You have to specify a sink name/index and a port name"
 msgstr "మీరు సింక్‌ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
 
 #: src/utils/pactl.c:2961
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name"
 msgstr "ప్లే చేయుటకు మీరు మాదిరి నామమును తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "మీరు మూలము నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2173
+=======
 #: src/utils/pactl.c:2974
 msgid "You have to specify a source name/index and a port name"
 msgstr "మీరు మూలము నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
 
 #: src/utils/pactl.c:2985
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name"
 msgstr "మీరు మాడ్యూల్ విషయసూచిక తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "ప్లే చేయుటకు మీరు మాదిరి నామమును తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "మీరు సింక్ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "మీరు సింక్ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "మీరు మాడ్యూల్ విషయసూచిక తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "మీరు మూలము నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "మీరు సింక్ ఇన్పుట్ విషయసూచిక మరియు వాల్యూమ్ తెలుపవలసి వుంది"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "చెల్లని సింకు యిన్పుట్ విషయసూచిక"
+
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "మీరు మూలము నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
@@ -3134,83 +4188,141 @@ msgid "Invalid sink input index"
 msgstr "చెల్లని సింకు యిన్పుట్ విషయసూచిక"
 
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source output index and a volume"
 msgstr "మీరు మూలము అవుట్పుట్ విషయసూచిక మరియు మూలము తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index"
 msgstr "చెల్లని సింకు యిన్పుట్ విషయసూచిక"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "మీరు సింక్‌ నామము/విషయసూచిక మరియు మ్యూట్ బూలియన్ తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid mute specification"
 msgstr "చెల్లనటువంటి మాదిరి విశదీకరణ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "మీరు మూలపు నామము/విషయసూచిక మరియు మ్యూట్ బూలియన్ తెలుపవలసివుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "మీరు సింక్ ఇన్పుట్ విషయసూచిక మరియు మ్యూట్ బూలియన్ తెలుపవలసివుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "చెల్లనటువంటి సింకు యిన్పుట్ విషయసూచిక విశదీకరణ"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "చెల్లనటువంటి సింకు యిన్పుట్ విషయసూచిక విశదీకరణ"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "మీరు మూలపు నామము/విషయసూచిక మరియు మ్యూట్ బూలియన్ తెలుపవలసివుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Invalid source output index specification"
 msgstr "చెల్లనటువంటి సింకు యిన్పుట్ విషయసూచిక విశదీకరణ"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "మీరు సింక్‌ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "మీరు సింక్‌ నామము/విషయసూచిక మరియు మ్యూట్ బూలియన్ తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "మీరు కార్డ్ నామము/విషయసూచిక మరియు ప్రొఫైల్ నామము తెలుపవలసి వుంది"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr ""
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr ""
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "ఎటువంటి విలువైన ఆదేశము తెలుపబడలేదు."
 
diff --git a/po/tr.po b/po/tr.po
index 9cb636c80..3fbfd4658 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,9 +10,15 @@ msgstr ""
 "Project-Id-Version: PulseAudio master\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-03-10 16:01+0000\n"
+"Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2023-05-27 21:20+0000\n"
 "Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language-Team: Turkish <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/tr/>\n"
 "Language: tr\n"
@@ -20,7 +26,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.5.1\n"
+=======
 "X-Generator: Weblate 4.17\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -105,17 +115,29 @@ msgstr ""
 "yöntemlerini döker\n"
 "      --cleanup-shm                     Eski paylaşımlı bellek segmentlerini "
 "temizler\n"
+<<<<<<< HEAD
+"      --start                           Eğer çalışmıyorsa arka plan "
+"programını başlatır\n"
+"  -k  --kill                             Çalışan bir arka plan progamını "
+"sonlandırır\n"
+"      --check                         Çalışan bir arka plan programını "
+=======
 "      --start                           Eğer çalışmıyorsa art alan hizmetini "
 "başlatır\n"
 "  -k  --kill                             Çalışan bir art alan hizmetini "
 "sonlandırır\n"
 "      --check                         Çalışan bir art alan hizmetini "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "denetler (sadece çıkış kodu döner)\n"
 "\n"
 "SEÇENEKLER:\n"
 "      --system[=BOOL]                   Sistem çapında örnek olarak "
 "çalıştırır\n"
+<<<<<<< HEAD
+"  -D, --daemonize[=BOOL]                Başladıktan sonra arka plan programı "
+=======
 "  -D, --daemonize[=BOOL]                Başladıktan sonra art alan hizmeti "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "olarak çalıştırır\n"
 "      --fail[=BOOL]                     Başlangıç başarısız olduğunda çıkar\n"
 "      --high-priority[=BOOL]            Yüksek öncelik seviyesi ayarlamayı "
@@ -136,7 +158,11 @@ msgstr ""
 "      --disallow-exit[=BOOL]            Kullanıcının çıkış isteğine izin "
 "vermez\n"
 "      --exit-idle-time=SANİYE           Boştayken ve bu süre geçtiğinde\n"
+<<<<<<< HEAD
+"                                        arka plan programını sonlandırır\n"
+=======
 "                                        art alan hizmetini sonlandırır\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "      --scache-idle-time=SANİYE         Boştayken ve bu süre geçtiğinde "
 "otomatik\n"
 "                                        yüklenmiş örnekleri kaldırır\n"
@@ -459,7 +485,11 @@ msgstr ""
 #: src/daemon/main.c:788
 #, c-format
 msgid "Failed to kill daemon: %s"
+<<<<<<< HEAD
+msgstr "Arka plan programı durdurulamadı: %s"
+=======
 msgstr "Art alan hizmeti durdurulamadı: %s"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:817
 msgid ""
@@ -532,7 +562,11 @@ msgstr "read() başarısız oldu: %s"
 
 #: src/daemon/main.c:954
 msgid "Daemon startup failed."
+<<<<<<< HEAD
+msgstr "Arka plan programını başlatma başarısız oldu."
+=======
 msgstr "Art alan hizmetini başlatma başarısız oldu."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:987
 #, c-format
@@ -575,6 +609,14 @@ msgid ""
 "Failed to initialize daemon due to errors while executing startup commands. "
 "Source of commands: %s"
 msgstr ""
+<<<<<<< HEAD
+"Başlatma komutlarını çalıştırırken oluşan hatalar nedeniyle arka plan "
+"programı başlatılamadı. Komutların kaynağı: %s"
+
+#: src/daemon/main.c:1280
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr "Hiç yüklü modül olmadan arka plan programının çalışması reddediliyor."
+=======
 "Başlatma komutlarını çalıştırırken oluşan hatalar nedeniyle art alan hizmeti "
 "başlatılamadı. Komutların kaynağı: %s"
 
@@ -583,6 +625,7 @@ msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr ""
 "Hiç modül yüklenmeden çalışmaya başlamayan art alan hizmeti, çalışmayı "
 "reddediyor."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/pulseaudio.desktop.in:4
 msgid "PulseAudio Sound System"
@@ -613,7 +656,11 @@ msgid "Line In"
 msgstr "Hat Girişi"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Mikrofon"
 
@@ -634,12 +681,20 @@ msgid "Internal Microphone"
 msgstr "Dahili Mikrofon"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Radyo"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Video"
 
@@ -676,12 +731,20 @@ msgid "No Bass Boost"
 msgstr "Bas Artırma Yok"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Hoparlör"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Kulaklık"
 
@@ -745,6 +808,13 @@ msgstr "Çok Kanallı Çıkış"
 msgid "Game Output"
 msgstr "Oyun Çıkışı"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-mixer.c:2818
+msgid "Game Output"
+msgstr "Oyun Çıkışı"
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
 msgid "Chat Output"
 msgstr "Sohbet Çıkışı"
@@ -789,7 +859,11 @@ msgid "Stereo"
 msgstr "Stereo"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Kulaklık"
 
@@ -902,7 +976,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Tek Kanallı Sohbet + 7.1 Çevresel Ses"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Kapalı"
 
@@ -916,7 +994,11 @@ msgstr "%s Çıkışı"
 msgid "%s Input"
 msgstr "%s Girişi"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -933,7 +1015,11 @@ msgstr ""
 "Biz POLLOUT ayarı ile uyandırıldık -- bununla birlikte sonraki "
 "snd_pcm_avail() 0 ya da min_avail değerinden küçük başka bir değer döndü."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1015,6 +1101,36 @@ msgstr[0] ""
 "Büyük ihtimalle bu bir ALSA sürücüsü '%s' hatasıdır. Lütfen bu sorunu ALSA "
 "geliştiricilerine bildirin."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth Girişi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth Çıkışı"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Ahizesiz"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Kulaklık"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Taşınabilir"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Araba"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1043,9 +1159,37 @@ msgid "Car"
 msgstr "Araba"
 
 #: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "HiFi"
 msgstr "Yüksek Kalite"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Yüksek Kaliteli Çalma (A2DP Alıcı)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Yüksek Kaliteli Yakalama (A2DP Kaynak)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Kulaklık Ana Birimi (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Kulaklık Ses Geçidi (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Ahizesiz Ana Birimi (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
 msgid "Phone"
 msgstr "Telefon"
@@ -1071,6 +1215,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Ahizesiz Ana Birimi (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Ahizesiz Ses Geçidi (HFP)"
 
@@ -1133,8 +1278,13 @@ msgstr ""
 "otomatikyüklenmiş=<set if this module is being loaded automatically> "
 "ses_paylaşım_kullan=<yes or no> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr "%s üzerinde FFT tabanlı dengeleyici"
@@ -1174,11 +1324,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Zamanlanmış BOŞ alıcı"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Boş Çıkış"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Boş Çıkış"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Biçim ayarlanamadı: geçersiz biçim dizisi %s"
@@ -1201,14 +1359,24 @@ msgstr "@HOSTNAME@ üzerindeki SES"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "%s@%s için tünel"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "%s/%s tünel"
@@ -1239,7 +1407,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Bilinmeyen aygıt modeli"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "RAOP standart profili"
 
@@ -1450,7 +1622,10 @@ msgstr "Üst Arka Sağ"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(geçersiz)"
 
@@ -1558,11 +1733,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Geçersiz günlük hedefi."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Dahili Ses"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Dahili Ses"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Modem"
 
@@ -1837,7 +2020,11 @@ msgstr "Akış izleme ayarlanamadı: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() başarısız oldu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Bağlantı hatası: %s"
@@ -2046,7 +2233,11 @@ msgstr ""
 "Libpulse %s ile derlendi\n"
 "Libpulse %s ile bağlantılı\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Geçersiz istemci adı '%s'"
@@ -2119,7 +2310,11 @@ msgstr ""
 "Uyarı: belirtilmiş örnek tanımlama, dosyadan alınacak başka bir tanımlama "
 "ile üzerine yazılacak."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Dosyadan örnekleme tanımı belirlenemedi."
 
@@ -2154,7 +2349,11 @@ msgstr "çal"
 msgid "Failed to set media name."
 msgstr "Ortam adı ayarlanamadı."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() başarısız oldu."
 
@@ -2162,11 +2361,19 @@ msgstr "pa_mainloop_new() başarısız oldu."
 msgid "io_new() failed."
 msgstr "io_new() başarısız oldu."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() başarısız oldu."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() başarısız oldu."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() başarısız oldu: %s"
@@ -2175,6 +2382,23 @@ msgstr "pa_context_connect() başarısız oldu: %s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() başarısız oldu."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() başarısız oldu."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "AD [DEĞİŞKENLER ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "AD|#A"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() başarısız oldu."
@@ -2190,6 +2414,7 @@ msgstr "AD|#A"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "AD"
 
@@ -2201,7 +2426,11 @@ msgstr "AD|#A SES"
 msgid "#N VOLUME"
 msgstr "#N SES"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "AD|#A 1|0"
 
@@ -2237,7 +2466,11 @@ msgstr "YOLADI"
 msgid "FILENAME SINK|#N"
 msgstr "DOSYAADI ALICI|#A"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#A ALICI|KAYNAK"
 
@@ -2245,6 +2478,17 @@ msgstr "#A ALICI|KAYNAK"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "KART PROFİLİ"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "AD|#A BAĞLANTI NOKTASI"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "KART PROFİLİ"
@@ -2254,6 +2498,7 @@ msgid "NAME|#N PORT"
 msgstr "AD|#A BAĞLANTI NOKTASI"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "KART-ADI|KART-#N BAĞLANTI-NOKTASI UZAKLIK"
 
@@ -2269,7 +2514,11 @@ msgstr "SAYISAL-SEVİYE"
 msgid "FRAMES"
 msgstr "KARELER"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "ALICI MESAJ [MESAJ_PARAMETRELERİ]"
 
@@ -2300,7 +2549,11 @@ msgstr ""
 #: src/utils/pacmd.c:143
 msgid "No PulseAudio daemon running, or not running as session daemon."
 msgstr ""
+<<<<<<< HEAD
+"Çalışan PulseAudio arka plan programı yok veya bir oturum arka plan progamı "
+=======
 "Çalışan PulseAudio art alan hizmeti yok veya bir oturum art alan hizmeti "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "olarak çalışmıyor."
 
 #: src/utils/pacmd.c:148
@@ -2315,11 +2568,19 @@ msgstr "connect(): %s"
 
 #: src/utils/pacmd.c:173
 msgid "Failed to kill PulseAudio daemon."
+<<<<<<< HEAD
+msgstr "PulseAudio arka plan programı durdurulamadı."
+
+#: src/utils/pacmd.c:181
+msgid "Daemon not responding."
+msgstr "Arka plan programı yanıt vermiyor."
+=======
 msgstr "PulseAudio art alan hizmeti durdurulamadı."
 
 #: src/utils/pacmd.c:181
 msgid "Daemon not responding."
 msgstr "Art alan hizmeti yanıt vermiyor."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
 #, c-format
@@ -2336,40 +2597,69 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "İstatistikler alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "Şu anda kullanımda: %u blok toplamda %s bayt içeriyor.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] "Tüm ömrü boyunca ayrılan: %u blok toplamda %s bayt içeriyor.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Örnekleme ön bellek boyutu: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Sunucu bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, fuzzy, c-format
+msgid "%s\n"
+msgstr "%s %s\n"
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2386,7 +2676,11 @@ msgstr ""
 "İstemci Dizini: %u\n"
 "Desen Boyutu: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2409,6 +2703,74 @@ msgstr ""
 "Öntanımlı Kaynak: %s\n"
 "Çerez: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "kullanılabilirlik bilinmiyor"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "kullanılabilir"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "kullanılabilir değil"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Harici"
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Hat"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Mikrofon"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Ahize"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Kulak içi kulaklık"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Ağ"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Analog"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "kullanılabilirlik bilinmiyor"
@@ -2475,11 +2837,16 @@ msgstr "Analog"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Alıcı bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2518,37 +2885,66 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tBağlantı Noktaları:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (tür: %s, öncelik: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", kullanılabilirlik grubu: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", kullanılabilirlik grubu: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tEtkin Bağlantı Noktası: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tBiçimler:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Kaynak bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2587,6 +2983,17 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "yok"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2596,11 +3003,16 @@ msgid "n/a"
 msgstr "yok"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Modül bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2617,12 +3029,20 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "İstemci bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2637,12 +3057,20 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Kart bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2659,30 +3087,50 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfiller:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr ""
 "\t\t%s: %s (alıcılar: %u, kaynaklar: %u, öncelik: %u, kullanılabilir: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tEtkin Profil: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 "\t\t%s: %s (tür: %s, öncelik: %u, gecikme uzaklığı: %<PRId64> usec%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2691,17 +3139,29 @@ msgstr ""
 "\t\t\tÖzellikler:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\\Profil(ler)in parçası: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Alıcı giriş bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2740,12 +3200,20 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Kaynak çıkış bilgileri alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2784,12 +3252,20 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Örnekleme bilgisi alınamadı: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2818,16 +3294,46 @@ msgstr ""
 "\tÖzellikler:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Hata: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Mesaj gönderme başarısız oldu: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr "liste işleyicileri mesajı başarısız oldu: %s"
+
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr "liste işleyicileri mesajı yanıtı doğru şekilde ayrıştırılamadı"
+
+#: src/utils/pactl.c:951
+#, fuzzy
+msgid "list-handlers message response is not a JSON array"
+msgstr "liste işleyicileri mesajı yanıtı doğru şekilde ayrıştırılamadı"
+
+#: src/utils/pactl.c:962
+#, fuzzy, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr "liste işleyicileri mesajı yanıtı doğru şekilde ayrıştırılamadı"
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1695
 #, c-format
 msgid "list-handlers message failed: %s"
@@ -2847,11 +3353,16 @@ msgid "list-handlers message response array element %d is not a JSON object"
 msgstr "list-handlers mesajı yanıtı dizisi ögesi %d bir JSON nesnesi değil"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Modül kaldırılamadı: Modül %s yüklenemedi"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2863,11 +3374,74 @@ msgstr[0] ""
 "Ses ayarlanamadı: %d kanal için ses ayarlamayı denediniz, ancak desteklenen "
 "kanal sayısı %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Örnekleme yüklenemedi: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Dosyanın erken bitişi"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "yeni"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "değiştir"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "kaldır"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "bilinmeyen"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "alıcı"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "kaynak"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "alıcı-girişi"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "alıcı-çıkışı"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "modül"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "istemci"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "örnek-önbellek"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "sunucu"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "kart"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Dosyanın erken bitişi"
@@ -2925,10 +3499,66 @@ msgid "card"
 msgstr "kart"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "%2$s #%3$u üzerinde '%1$s' olayı\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT alındı, çıkılıyor."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Geçersiz ses tanımı"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "İzin verilebilir aralık dışındaki ses.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Geçersiz ses tanımı numarası.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Tutarsız ses tanımı.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[seçenekler]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TÜR]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "DOSYAADI [AD]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "AD [ALICI]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "AD|#A SES [SES ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#A SES [SES ...]"
+
+#: src/utils/pactl.c:1859
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT alındı, çıkılıyor."
@@ -2982,9 +3612,21 @@ msgid "#N VOLUME [VOLUME ...]"
 msgstr "#A SES [SES ...]"
 
 #: src/utils/pactl.c:2655
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0|toggle"
 msgstr "AD|#N 1|0|geçiş"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|geçiş"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#A BİÇİMLER"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2656
 msgid "#N 1|0|toggle"
 msgstr "#N 1|0|geçiş"
@@ -2994,6 +3636,7 @@ msgid "#N FORMATS"
 msgstr "#A BİÇİMLER"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3004,7 +3647,11 @@ msgstr ""
 "@DEFAULT_SINK@, @DEFAULT_SOURCE@ ve @DEFAULT_MONITOR@ özel adları\n"
 "öntanımlı alıcıyı, kaynağı ve ekranı belirtmek için kullanılabilir.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3028,7 +3675,11 @@ msgstr ""
 "  -n, --client-name=AD                Sunucu üzerinde bu istemci nasıl "
 "çağrılacak\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3039,16 +3690,47 @@ msgstr ""
 "Libpulse %s ile derlendi\n"
 "Libpulse %s ile bağlantılı\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Geçersiz biçim değeri '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Şunlardan birini belirtin ya da hiçbir şey belirtmeyin: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Lütfen yüklemek için bir örnekleme dosyası belirtin"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Ses dosyası açılamadı."
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Uyarı: Dosyadan örnekleme tanımı belirlenemedi."
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Çalmak için örnek ad belirtmelisiniz"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Kaldırmak için örnek ad belirtmelisiniz"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Bir alıcı giriş göstergesi ve alıcı belirtmelisiniz"
+
+#: src/utils/pactl.c:2042
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Lütfen yüklemek için bir örnekleme dosyası belirtin"
@@ -3074,9 +3756,21 @@ msgid "You have to specify a sink input index and a sink"
 msgstr "Bir alıcı giriş göstergesi ve alıcı belirtmelisiniz"
 
 #: src/utils/pactl.c:2854
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a source"
 msgstr "Bir kaynak çıkışı dizini ve bir kaynak belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Bir modül adı ve değişken belirtmelisiniz."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Bir modül dizini ya da adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2869
 msgid "You have to specify a module name and arguments."
 msgstr "Bir modül adı ve değişken belirtmelisiniz."
@@ -3086,16 +3780,25 @@ msgid "You have to specify a module index or name"
 msgstr "Bir modül dizini ya da adı belirtmelisiniz"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Birden daha fazla alıcı belirtemezsiniz. Bir boolean değer belirtmelisiniz."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Geçersiz bekletme tanımlaması."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Geçersiz bekletme tanımlaması."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3103,14 +3806,42 @@ msgstr ""
 "Bir kaynaktan daha fazlasını belirtemezsiniz. Bir boolean değer "
 "belirtmelisiniz."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Bir kart adı/dizin ve bir profil adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2138
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Bir kart adı/dizin ve bir profil adı belirtmelisiniz"
 
 #: src/utils/pactl.c:2950
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name/index and a port name"
 msgstr "Bir alıcı adı/dizini ve bir bağlantı noktası adı belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Bir alıcı adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Bir kaynak adı/dizini ve bir bağlantı noktası adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Bir kaynak adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Bir alıcı adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2196
+=======
 #: src/utils/pactl.c:2961
 msgid "You have to specify a sink name"
 msgstr "Bir alıcı adı belirtmelisiniz"
@@ -3128,6 +3859,7 @@ msgid "You have to specify a sink name/index"
 msgstr "Bir alıcı adı/dizini belirtmelisiniz"
 
 #: src/utils/pactl.c:3008
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Bir alıcı adı/dizini ve bir ses seviyesi belirtmelisiniz"
 
@@ -3135,57 +3867,107 @@ msgstr "Bir alıcı adı/dizini ve bir ses seviyesi belirtmelisiniz"
 msgid "You have to specify a source name/index"
 msgstr "Bir kaynak adı/dizini belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Bir kaynak adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Bir kaynak adı/dizini ve bir ses belirtmelisiniz"
+
+#: src/utils/pactl.c:2232
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "Bir kaynak adı/dizini ve bir ses belirtmelisiniz"
 
 #: src/utils/pactl.c:3044
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a sink input index and a volume"
 msgstr "Bir alıcı girişi dizini ve bir ses seviyesi belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2237
+=======
 #: src/utils/pactl.c:3049
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid sink input index"
 msgstr "Geçersiz alıcı girişi dizini"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2248
+=======
 #: src/utils/pactl.c:3060
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a source output index and a volume"
 msgstr "Bir kaynak çıkışı dizini ve bir ses seviyesi belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2253
+=======
 #: src/utils/pactl.c:3065
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid source output index"
 msgstr "Geçersiz kaynak çıkış dizini"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Bir alıcı adı/dizini ve bir sessizlik eylemi (0, 1 veya 'toggle') "
 "belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Geçersiz sessiz tanımı"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Geçersiz sessiz tanımı"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Bir kaynak adı/dizini ve bir sessizlik eylemi (0, 1 veya 'toggle') "
 "belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Bir alıcı girişi dizini ve bir sessizlik eylemi (0, 1 veya 'toggle') "
 "belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+=======
 #: src/utils/pactl.c:3131
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid sink input index specification"
 msgstr "Geçersiz alıcı girişi dizini tanımı"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3193,15 +3975,27 @@ msgstr ""
 "Bir kaynak çıkış dizini ve bir sessizlik eylemi (0, 1 veya 'toggle') "
 "belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+=======
 #: src/utils/pactl.c:3149
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Invalid source output index specification"
 msgstr "Geçersiz kaynak çıkış dizini tanımlaması"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "En azından bir nesne yolu ve bir mesaj adı belirtmelisiniz"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3162
 msgid "You have to specify at least an object path and a message name"
 msgstr "En azından bir nesne yolu ve bir mesaj adı belirtmelisiniz"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
@@ -3209,7 +4003,11 @@ msgstr ""
 "Fazladan belirtilen argümanlar yok sayılacaktır. Tüm mesaj parametrelerinin "
 "tek bir dizge olarak verilmesi gerektiğini unutmayın."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3217,17 +4015,29 @@ msgstr ""
 "Bir alıcı dizini ve desteklenen biçimlerin noktalı virgülle ayrılmış bir "
 "listesini belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+=======
 #: src/utils/pactl.c:3194
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr ""
 "Bir kart adı/dizini, bir bağlantı noktası adı ve bir gecikme uzaklığı "
 "belirtmelisiniz"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Gecikme uzaklığı ayrıştırılamadı"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3201
 msgid "Could not parse latency offset"
 msgstr "Gecikme uzaklığı ayrıştırılamadı"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Belirtilen geçerli komut yok."
 
diff --git a/po/uk.po b/po/uk.po
index df0412545..c7b0309ec 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,8 +7,13 @@ msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2021-05-19 11:02+0000\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2022-05-18 22:27+0000\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <https://translate.fedoraproject.org/projects/"
 "pulseaudio/pulseaudio/uk/>\n"
@@ -18,7 +23,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+<<<<<<< HEAD
+"X-Generator: Weblate 4.6.2\n"
+=======
 "X-Generator: Weblate 4.12.2\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/cmdline.c:113
 #, c-format
@@ -618,7 +627,11 @@ msgid "Line In"
 msgstr "Лінійний вхід"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "Мікрофон"
 
@@ -639,12 +652,20 @@ msgid "Internal Microphone"
 msgstr "Вбудований мікрофон"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "Радіо"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "Відео"
 
@@ -681,12 +702,20 @@ msgid "No Bass Boost"
 msgstr "Без підсилення"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "Гучномовець"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "Аналогові навушники"
 
@@ -794,7 +823,11 @@ msgid "Stereo"
 msgstr "Стерео"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "Гарнітура"
 
@@ -907,7 +940,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr "Моно, спілкування + об'ємний 7.1"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "Вимкнено"
 
@@ -921,7 +958,11 @@ msgstr "вихід %s"
 msgid "%s Input"
 msgstr "вхід %s"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -938,7 +979,11 @@ msgstr ""
 "Службу було викликано зі встановленим POLLOUT, але наступний виклик "
 "snd_pcm_avail() повернув 0 або інше значення < min_avail."
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -1052,6 +1097,64 @@ msgstr[2] ""
 "Ймовірно, ви натрапили на ваду у драйвері ALSA «%s». Будь ласка, повідомте "
 "про цю ваду розробникам ALSA."
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "Bluetooth (вхід)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "Bluetooth (відтворення)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "Пристрій гучного зв’язку"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "Навушники"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "Портативна система"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "Автомобільна система"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "Телефон"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Високоточне відтворення (приймач A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Високоточне захоплення (джерело A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+msgid "Headset Head Unit (HSP)"
+msgstr "Головний модуль гарнітури (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Звуковий шлюз гарнітури (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Головний модуль гарнітури (HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1108,6 +1211,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "Головний модуль гарнітури (HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "Звуковий шлюз гарнітури (HFP)"
 
@@ -1215,11 +1319,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "NULL-приймач з годинником"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Нуль-відтворення"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Нуль-відтворення"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "Не вдалося встановити формат: некоректний рядок формату %s"
@@ -1242,14 +1354,24 @@ msgstr "Звук на @НАЗВАВУЗЛА@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "Тунель для %s@%s"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "Тунель до %s/%s"
@@ -1281,7 +1403,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "Невідома модель пристрою"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "Стандартний профіль RAOP"
 
@@ -1601,11 +1727,19 @@ msgstr ""
 msgid "Invalid log target."
 msgstr "Некоректна адреса файла журналу."
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "Вбудоване аудіо"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "Вбудоване аудіо"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "Модем"
 
@@ -1882,7 +2016,11 @@ msgstr "Не вдалося встановити потік спостереже
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Спроба виконання pa_stream_connect_record() зазнала невдачі: %s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Спроба встановлення з’єднання зазнала невдачі: %s"
@@ -2090,7 +2228,11 @@ msgstr ""
 "Зібрано з libpulse %s\n"
 "З’єднано з libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Некоректна назва клієнта «%s»"
@@ -2163,7 +2305,11 @@ msgstr ""
 "Попередження: вказану частотну специфікацію буде перезаписано специфікацією "
 "з файла."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "Не вдалося отримати дані щодо частотної специфікації з файла."
 
@@ -2198,7 +2344,11 @@ msgstr "відтворення"
 msgid "Failed to set media name."
 msgstr "Не вдалося встановити назву носія даних."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "Спроба виконання pa_mainloop_new() завершилася невдало."
 
@@ -2206,11 +2356,19 @@ msgstr "Спроба виконання pa_mainloop_new() завершилася
 msgid "io_new() failed."
 msgstr "Спроба виконання io_new() завершилася невдало."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "Спроба виконання pa_context_new() завершилася невдало."
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "Спроба виконання pa_context_new() завершилася невдало."
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Спроба виконання pa_context_connect() завершилася невдало: %s"
@@ -2219,6 +2377,23 @@ msgstr "Спроба виконання pa_context_connect() завершила
 msgid "pa_context_rttime_new() failed."
 msgstr "Спроба виконання pa_context_new() завершилася невдало."
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "Спроба виконання pa_mainloop_run() завершилася невдало."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "НАЗВА [АРГУМЕНТИ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "НАЗВА|НОМЕР"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "Спроба виконання pa_mainloop_run() завершилася невдало."
@@ -2234,6 +2409,7 @@ msgstr "НАЗВА|НОМЕР"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "НАЗВА"
 
@@ -2245,7 +2421,11 @@ msgstr "НАЗВА|НОМЕР ГУЧНІСТЬ"
 msgid "#N VOLUME"
 msgstr "НОМЕР ГУЧНІСТЬ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "НАЗВА|НОМЕР 1|0"
 
@@ -2281,7 +2461,11 @@ msgstr "ШЛЯХ"
 msgid "FILENAME SINK|#N"
 msgstr "НАЗВА_ФАЙЛА ПРИЙМАЧ|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "НОМЕР ПРИЙМАЧ|ДЖЕРЕЛО"
 
@@ -2289,6 +2473,17 @@ msgstr "НОМЕР ПРИЙМАЧ|ДЖЕРЕЛО"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "ПРОФІЛЬ КАРТКИ"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "НАЗВА|НОМЕР ПОРТУ"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "ПРОФІЛЬ КАРТКИ"
@@ -2298,6 +2493,7 @@ msgid "NAME|#N PORT"
 msgstr "НАЗВА|НОМЕР ПОРТУ"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "НАЗВА-КАРТКИ|№КАРТКИ ПОРТ ЗСУВ"
 
@@ -2313,7 +2509,11 @@ msgstr "ЧИСЛОВИЙ РІВЕНЬ"
 msgid "FRAMES"
 msgstr "БЛОКИ"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr "ОТРИМУВАЧ ПОВІДОМЛЕННЯ [ПАРАМЕТРИ_ПОВІДОМЛЕННЯ]"
 
@@ -2381,12 +2581,20 @@ msgstr "poll(): %s"
 msgid "read(): %s"
 msgstr "read(): %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "Не вдалося отримати статистичні дані: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
@@ -2394,7 +2602,11 @@ msgstr[0] "Зараз використано: %u блок, що містять 
 msgstr[1] "Зараз використано: %u блоки, що містять загалом %s байтів.\n"
 msgstr[2] "Зараз використано: %u блоків, що містять загалом %s байтів.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2406,22 +2618,39 @@ msgstr[1] ""
 msgstr[2] ""
 "Виділено протягом виконання загалом: %u блоків, що містять %s байтів.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "Розмір кешу фрагментів: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "Не вдалося отримати дані щодо сервера: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2438,7 +2667,11 @@ msgstr ""
 "Номер клієнта: %u\n"
 "Розмір фрагмента: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2461,6 +2694,74 @@ msgstr ""
 "Типове джерело: %s\n"
 "Кука: %04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr "невідома доступність"
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr "доступний"
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr "недоступний"
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+msgid "Unknown"
+msgstr "Невідомий"
+
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr "Доп."
+
+#: src/utils/pactl.c:287
+msgid "Line"
+msgstr "Лінійний"
+
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr "Мікрофон"
+
+#: src/utils/pactl.c:290
+msgid "Handset"
+msgstr "Трубка"
+
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr "Навушник"
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr "ТБ"
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:298
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr "Мережа"
+
+#: src/utils/pactl.c:305
+msgid "Analog"
+msgstr "Аналоговий"
+
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr "невідома доступність"
@@ -2527,11 +2828,16 @@ msgstr "Аналоговий"
 
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Не вдалося отримати дані щодо приймача: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2570,37 +2876,66 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tПорти:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (тип: %s, пріоритетність: %u%s%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ", група доступності: "
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ", група доступності: "
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tАктивний порт: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\tФормати:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Не вдалося отримати дані щодо джерела: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2639,6 +2974,17 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "н/д"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2648,11 +2994,16 @@ msgid "n/a"
 msgstr "н/д"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Не вдалося отримати дані щодо модуля: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2669,12 +3020,20 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Не вдалося отримати дані щодо клієнта: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2689,12 +3048,20 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Не вдалося отримати дані щодо карти: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2711,22 +3078,38 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tПрофілі:\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (приймачів: %u, джерел: %u, пріоритет: %u, доступно: %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tАктивний профіль: %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
@@ -2734,7 +3117,11 @@ msgstr ""
 "\t\t%s: %s (тип: %s, пріоритетність: %u, зсув латентності: %<PRId64> мкс%s"
 "%s, %s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2743,17 +3130,29 @@ msgstr ""
 "\t\t\tВластивості:\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\tЧастина профілів: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Не вдалося отримати відомостей щодо вхідного каналу приймача: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2792,12 +3191,20 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Не вдалося отримати дані щодо відтворення джерела: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2836,12 +3243,20 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Не вдалося отримати дані щодо фрагмента: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2870,21 +3285,53 @@ msgstr ""
 "\tВластивості:\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "Помилка: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Send message failed: %s"
 msgstr "Не вдалося надіслати повідомлення: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr "помилка обробки повідомлення list-handlers: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+"не вдалося обробити належним чином повідомлення-відповідь list-handlers"
+
+#: src/utils/pactl.c:951
+#, fuzzy
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+"не вдалося обробити належним чином повідомлення-відповідь list-handlers"
+
+#: src/utils/pactl.c:962
+#, fuzzy, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+"не вдалося обробити належним чином повідомлення-відповідь list-handlers"
+
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr "не вдалося належним чином обробити відповідь list-handlers"
@@ -2900,11 +3347,16 @@ msgstr ""
 "елемент масиву відповіді повідомлення list-handlers %d не є об'єктом JSON"
 
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "Не вдалося вивантажити модуль: модуль %s не завантажено"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2922,11 +3374,74 @@ msgstr[2] ""
 "Не вдалося встановити гучність: ви намагалися встановити гучність для %d "
 "каналів, хоча передбачено підтримку %d каналів\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Не вдалося вивантажити зразок: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "Передчасне завершення файла"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "створити"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "змінити"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "вилучити"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "невідомий"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "приймач"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "джерело"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "вхід приймача"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "відтворення джерела"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "модуль"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "клієнт"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "кеш семплів"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "сервер"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "картка"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "Передчасне завершення файла"
@@ -2984,10 +3499,78 @@ msgid "card"
 msgstr "картка"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "Подія «%s» на %s №%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "Отримано сигнал SIGINT, завершення роботи."
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "Некоректна специфікація гучності"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "Гучність поза межами дозволеного діапазону.\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "Некоректна кількість специфікацій гучності.\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "Несумісна специфікація гучності.\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[параметри]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[ТИП]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "НАЗВА_ФАЙЛА [НАЗВА]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "НАЗВА [ПРИЙМАЧ]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "НАЗВА|НОМЕР ГУЧНІСТЬ [ГУЧНІСТЬ ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "НОМЕР ГУЧНІСТЬ [ГУЧНІСТЬ ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "НАЗВА|НОМЕР 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "НОМЕР 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "НОМЕР ФОРМАТИ"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "Отримано сигнал SIGINT, завершення роботи."
@@ -3053,6 +3636,7 @@ msgid "#N FORMATS"
 msgstr "НОМЕР ФОРМАТИ"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3064,7 +3648,11 @@ msgstr ""
 "@DEFAULT_MONITOR@,\n"
 "можна скористатися для визначення типового приймача, джерела та монітора.\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+=======
 #: src/utils/pactl.c:2664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -3082,13 +3670,20 @@ msgstr ""
 "  -h, --help                            Показати цю довідку\n"
 "      --version                         Показати відомості щодо версії\n"
 "\n"
+<<<<<<< HEAD
+=======
 "  -f, --format=ФОРМАТ                   Формат результатів. Варіанти: "
 "«normal» або «json»\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "  -s, --server=СЕРВЕР                   Назва сервера, з яким слід "
 "з’єднатися\n"
 "  -n, --client-name=НАЗВА               Назва цього клієнта на сервері\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -3099,16 +3694,31 @@ msgstr ""
 "Зібрано з libpulse %s\n"
 "З’єднано з libpulse %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, c-format
 msgid "Invalid format value '%s'"
 msgstr "Некоректне значення формату «%s»"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "Нічого не вказуйте або вкажіть один з варіантів: %s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "Будь ласка, вкажіть файл фрагмента для завантаження"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "Не вдалося відкрити звуковий файл."
+
+#: src/utils/pactl.c:2001
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "Будь ласка, вкажіть файл фрагмента для завантаження"
@@ -3118,10 +3728,38 @@ msgid "Failed to open sound file."
 msgstr "Не вдалося відкрити звуковий файл."
 
 #: src/utils/pactl.c:2813
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Попередження: не вдалося отримати дані щодо частотної специфікації з файла."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "Вам слід вказати назву зразкового файла, який слід відтворити"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "Вам слід вказати назву зразкового файла, який слід вилучити"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "Вам слід вказати номер вхідного каналу приймача даних і приймач"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "Вам слід вказати номер джерела відтворення і джерело"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "Вам слід вказати назву модуля і аргументи."
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "Вам слід вказати номер або назву модуля"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2823
 msgid "You have to specify a sample name to play"
 msgstr "Вам слід вказати назву зразкового файла, який слід відтворити"
@@ -3147,17 +3785,26 @@ msgid "You have to specify a module index or name"
 msgstr "Вам слід вказати номер або назву модуля"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Не можна вказувати більше одного приймача. Вам слід вказати булівське "
 "значення."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "Некоректна специфікація призупинення."
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "Некоректна специфікація призупинення."
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -3165,6 +3812,63 @@ msgstr ""
 "Не можна вказувати більше одного джерела. Вам слід вказати булівське "
 "значення."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Вам слід вказати назву/номер карти і назву профілю"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Вам слід вказати назву/номер приймача і назву порту"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "Вам слід вказати назву приймача"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "Вам слід вказати назву/номер джерела і назву порту"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "Вам слід вказати назву джерела"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "Вам слід вказати назву приймача"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Вам слід вказати назву/номер приймача і гучність"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Вам слід вказати назву джерела"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "Вам слід вказати назву/номер джерела і гучність"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "Вам слід вказати номер вхідного каналу приймача даних і гучність"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "Некоректний номер вхідного каналу приймача даних"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "Вам слід вказати номер каналу відтворення і гучність"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "Некоректний номер джерела відтворення"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Вам слід вказати назву/номер карти і назву профілю"
@@ -3218,36 +3922,58 @@ msgid "Invalid source output index"
 msgstr "Некоректний номер джерела відтворення"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Вам слід вказати назву/номер приймача і значення вимикання звуку (0, 1 або "
 "«toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "Некоректна специфікація вимикання звуку"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "Некоректна специфікація вимикання звуку"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Вам слід вказати назву/номер джерела і значення вимикання звуку (0, 1 або "
 "«toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr ""
 "Вам слід вказати індекс входу приймача і значення вимикання звуку (0, 1 або "
 "«toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "Некоректна специфікація номера вхідного каналу приймача даних"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "Некоректна специфікація номера вхідного каналу приймача даних"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
@@ -3255,6 +3981,17 @@ msgstr ""
 "Вам слід вказати індекс виходу джерела і значення вимикання звуку (0, 1 або "
 "«toggle»)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "Некоректна специфікація номера джерела відтворення"
+
+#: src/utils/pactl.c:2350
+msgid "You have to specify at least an object path and a message name"
+msgstr "Вам слід вказати принаймні шлях до об'єкта і назву повідомлення"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "Некоректна специфікація номера джерела відтворення"
@@ -3264,6 +4001,7 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "Вам слід вказати принаймні шлях до об'єкта і назву повідомлення"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
@@ -3271,7 +4009,11 @@ msgstr ""
 "Надано зайві аргументи — їх буде проігноровано. Зауважте, що усі параметри "
 "повідомлення має бути надано у форматі одного рядка."
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
@@ -3279,6 +4021,17 @@ msgstr ""
 "Вам слід вказати номер приймача та список підтримуваних каналів, "
 "відокремлених комами"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "Вам слід вказати назву/номер карти, назву порту і зсув латентності"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "Не вдалося обробити дані щодо зсуву латентності"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "Вам слід вказати назву/номер карти, назву порту і зсув латентності"
@@ -3288,6 +4041,7 @@ msgid "Could not parse latency offset"
 msgstr "Не вдалося обробити дані щодо зсуву латентності"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "Не вказано коректної команди."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cd3abf407..d9b1b966c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,11 +12,18 @@ msgstr ""
 "Project-Id-Version: pulseaudio.master-tx\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+"PO-Revision-Date: 2016-03-26 13:00+0800\n"
+"Last-Translator: Luo Lei <luolei@ubuntukylin.com>\n"
+"Language-Team: Chinese (Simplified, GNOME) <i18n-zh@googlegroups.com>\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
 "PO-Revision-Date: 2021-12-04 09:16+0000\n"
 "Last-Translator: Lv Genggeng <lvgenggeng@uniontech.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
 "projects/pulseaudio/pulseaudio/zh_CN/>\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +33,11 @@ msgstr ""
 "X-Launchpad-Export-Date: 2016-03-22 13:23+0000\n"
 
 #: src/daemon/cmdline.c:113
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options]\n"
 "\n"
@@ -169,7 +180,10 @@ msgid "--fail expects boolean argument"
 msgstr "--fail 布尔参数"
 
 #: src/daemon/cmdline.c:265
+<<<<<<< HEAD
+=======
 #, fuzzy
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of error, warn, notice, info, debug)."
@@ -198,6 +212,10 @@ msgid "--use-pid-file expects boolean argument"
 msgstr "--use-pid-file 布尔参数"
 
 #: src/daemon/cmdline.c:328
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
 "valid file name 'file:<path>', 'newfile:<path>'."
@@ -239,8 +257,14 @@ msgid "--disable-shm expects boolean argument"
 msgstr "--disable-shm 布尔参数"
 
 #: src/daemon/cmdline.c:397
+<<<<<<< HEAD
+#, fuzzy
+msgid "--enable-memfd expects boolean argument"
+msgstr "--realtime 布尔参数"
+=======
 msgid "--enable-memfd expects boolean argument"
 msgstr "--enable-memfd 期望布尔型参数"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/daemon-conf.c:270
 #, c-format
@@ -513,6 +537,10 @@ msgid "Failed to get machine ID"
 msgstr "获取机器 ID 失败"
 
 #: src/daemon/main.c:1145
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "OK, so you are running PA in system mode. Please make sure that you actually "
 "do want to do that.\n"
@@ -533,15 +561,25 @@ msgid "pa_core_new() failed."
 msgstr "pa_core_new() 失败。"
 
 #: src/daemon/main.c:1268
+<<<<<<< HEAD
+#, fuzzy
+msgid "command line arguments"
+msgstr "参数过多。"
+=======
 msgid "command line arguments"
 msgstr "命令行参数"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:1275
 #, c-format
 msgid ""
 "Failed to initialize daemon due to errors while executing startup commands. "
 "Source of commands: %s"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "由于执行启动命令出错，初始化守护进程失败。原始的命令为：%s"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/daemon/main.c:1280
 msgid "Daemon startup without any loaded modules, refusing to work."
@@ -576,7 +614,11 @@ msgid "Line In"
 msgstr "输入插孔"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "话筒"
 
@@ -597,12 +639,20 @@ msgid "Internal Microphone"
 msgstr "内部话筒"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "无线电"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "视频"
 
@@ -639,12 +689,20 @@ msgid "No Bass Boost"
 msgstr "无重低音增强"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "扬声器"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "模拟耳机"
 
@@ -665,12 +723,22 @@ msgid "Analog Output"
 msgstr "模拟输出"
 
 #: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones 2"
 msgstr "模拟耳机"
 
 #: src/modules/alsa/alsa-mixer.c:2809
+<<<<<<< HEAD
+#, fuzzy
+msgid "Headphones Mono Output"
+msgstr "模拟单声道输出"
+=======
 msgid "Headphones Mono Output"
 msgstr "模拟耳机单声道输出"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:2810
 msgid "Line Out"
@@ -705,6 +773,26 @@ msgid "Multichannel Output"
 msgstr "多声道输出"
 
 #: src/modules/alsa/alsa-mixer.c:2818
+<<<<<<< HEAD
+#, fuzzy
+msgid "Game Output"
+msgstr "%s 输出"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+#, fuzzy
+msgid "Chat Output"
+msgstr "%s 输出"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+#, fuzzy
+msgid "Chat Input"
+msgstr "%s 输入"
+
+#: src/modules/alsa/alsa-mixer.c:2822
+#, fuzzy
+msgid "Virtual Surround 7.1"
+msgstr "虚拟环绕声信宿"
+=======
 msgid "Game Output"
 msgstr "游戏输出"
 
@@ -719,18 +807,30 @@ msgstr "聊天输入"
 #: src/modules/alsa/alsa-mixer.c:2822
 msgid "Virtual Surround 7.1"
 msgstr "虚拟环绕声信宿 7.1"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4563
 msgid "Analog Mono"
 msgstr "模拟单声道"
 
 #: src/modules/alsa/alsa-mixer.c:4564
+<<<<<<< HEAD
+#, fuzzy
+msgid "Analog Mono (Left)"
+msgstr "模拟单声道"
+
+#: src/modules/alsa/alsa-mixer.c:4565
+#, fuzzy
+msgid "Analog Mono (Right)"
+msgstr "模拟单声道"
+=======
 msgid "Analog Mono (Left)"
 msgstr "模拟单声道（左）"
 
 #: src/modules/alsa/alsa-mixer.c:4565
 msgid "Analog Mono (Right)"
 msgstr "模拟单声道（右）"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #. Note: Not translated to "Analog Stereo Input", because the source
 #. * name gets "Input" appended to it automatically, so adding "Input"
@@ -752,13 +852,23 @@ msgid "Stereo"
 msgstr "立体声"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "耳机"
 
 #: src/modules/alsa/alsa-mixer.c:4577 src/modules/alsa/alsa-mixer.c:4735
+<<<<<<< HEAD
+#, fuzzy
+msgid "Speakerphone"
+msgstr "扬声器"
+=======
 msgid "Speakerphone"
 msgstr "喇叭扩音器"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4578 src/modules/alsa/alsa-mixer.c:4579
 msgid "Multichannel"
@@ -834,11 +944,19 @@ msgstr "数字环绕 5.1（HDMI）"
 
 #: src/modules/alsa/alsa-mixer.c:4597
 msgid "Chat"
+<<<<<<< HEAD
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4598
+msgid "Game"
+msgstr ""
+=======
 msgstr "聊天"
 
 #: src/modules/alsa/alsa-mixer.c:4598
 msgid "Game"
 msgstr "游戏"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/alsa/alsa-mixer.c:4732
 msgid "Analog Mono Duplex"
@@ -857,6 +975,18 @@ msgid "Multichannel Duplex"
 msgstr "多声道双工"
 
 #: src/modules/alsa/alsa-mixer.c:4738
+<<<<<<< HEAD
+#, fuzzy
+msgid "Stereo Duplex"
+msgstr "模拟立体声双工"
+
+#: src/modules/alsa/alsa-mixer.c:4739
+msgid "Mono Chat + 7.1 Surround"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 msgid "Stereo Duplex"
 msgstr "立体声双工"
 
@@ -866,6 +996,7 @@ msgstr "单声道聊天+7.1环绕声"
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "关"
 
@@ -879,7 +1010,11 @@ msgstr "%s 输出"
 msgid "%s Input"
 msgstr "%s 输入"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-sink.c:652 src/modules/alsa/alsa-sink.c:842
+=======
 #: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -895,7 +1030,11 @@ msgstr ""
 "我们因 POLLOUT 被设置而唤醒 -- 但结果是 snd_pcm_avail() 返回 0 或者另一个小于"
 "最小可用值的数值。"
 
+<<<<<<< HEAD
+#: src/modules/alsa/alsa-source.c:611 src/modules/alsa/alsa-source.c:777
+=======
 #: src/modules/alsa/alsa-source.c:636 src/modules/alsa/alsa-source.c:802
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -912,7 +1051,11 @@ msgstr ""
 "最小可用值的数值。"
 
 #: src/modules/alsa/alsa-util.c:1183 src/modules/alsa/alsa-util.c:1277
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu byte (%lu "
 "ms).\n"
@@ -924,11 +1067,22 @@ msgid_plural ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
+<<<<<<< HEAD
+"snd_pcm_avail() 返回的值非常大：%lu 字节(%lu 毫秒)。\n"
+"这很可能是由 ALSA 驱动程序 %s 的缺陷导致的。请向 ALSA 开发者报告这个问题。"
+msgstr[1] ""
+"snd_pcm_avail() 返回的值非常大：%lu 字节(%lu 毫秒)。\n"
+"这很可能是由 ALSA 驱动程序 %s 的缺陷导致的。请向 ALSA 开发者报告这个问题。"
+
+#: src/modules/alsa/alsa-util.c:1249
+#, fuzzy, c-format
+=======
 "snd_pcm_avail() 的返回值非常大：%lu 字节(%lu毫秒)。\n"
 "这很可能是由 ALSA 驱动程序' %s' 的缺陷导致的。请向 ALSA 开发者报告这个问题。"
 
 #: src/modules/alsa/alsa-util.c:1249
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li byte (%s"
 "%lu ms).\n"
@@ -940,6 +1094,12 @@ msgid_plural ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
+<<<<<<< HEAD
+"snd_pcm_delay() 返回的值非常大：%li 字节(%s%lu 毫秒)。\n"
+"这很可能是由 ALSA 驱动程序 %s 的缺陷导致的。请向 ALSA 开发者报告这个问题。"
+msgstr[1] ""
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "snd_pcm_delay() 返回的值非常大：%li 字节(%s%lu 毫秒)。\n"
 "这很可能是由 ALSA 驱动程序 '%s' 的缺陷导致的。请向 ALSA 开发者报告这个问题。"
 
@@ -955,7 +1115,11 @@ msgstr ""
 "很可能是 ALSA 驱动程序 '%s' 中的 bug。请向 ALSA 开发者举报这个问题。"
 
 #: src/modules/alsa/alsa-util.c:1339
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu byte "
 "(%lu ms).\n"
@@ -967,6 +1131,77 @@ msgid_plural ""
 "Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
 "to the ALSA developers."
 msgstr[0] ""
+<<<<<<< HEAD
+"snd_pcm_mmap_begin() 返回的值非常大：%lu 字节(%lu ms)。\n"
+"这很可能是由 ALSA 驱动程序 %s 中的 bug。请向 ALSA 开发者举报这个问题。"
+msgstr[1] ""
+"snd_pcm_mmap_begin() 返回的值非常大：%lu 字节(%lu ms)。\n"
+"这很可能是由 ALSA 驱动程序 %s 中的 bug。请向 ALSA 开发者举报这个问题。"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "蓝牙输入"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "蓝牙输出"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "免手操作"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "头戴耳机"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "便携式"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "车内"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "高保真"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "电话"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "高保真回放 (A2DP 信宿)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "高保真采集（A2DP 信源）"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "头戴式耳机单元 (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "头戴式音频网关 (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "头戴式耳机单元 (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "头戴式音频网关 (HSP/HFP)"
+
+=======
 "snd_pcm_mmap_begin() 的返回值非常大：%lu 字节(%lu ms)。\n"
 "这很可能是由 ALSA 驱动程序' %s' 中的 bug。请向 ALSA 开发者举报这个问题。"
 
@@ -1029,6 +1264,7 @@ msgstr "头戴式耳机单元 (HFP)"
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "头戴式音频网关 (HFP)"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #: src/modules/echo-cancel/module-echo-cancel.c:59
 msgid ""
 "source_name=<name for the source> source_properties=<properties for the "
@@ -1065,8 +1301,14 @@ msgid "Always keeps at least one sink loaded even if it's a null one"
 msgstr "总是保持至少载入一个信宿，即使它并不真实存在"
 
 #: src/modules/module-always-source.c:35
+<<<<<<< HEAD
+#, fuzzy
+msgid "Always keeps at least one source loaded even if it's a null one"
+msgstr "总是保持至少载入一个信宿，即使它并不真实存在"
+=======
 msgid "Always keeps at least one source loaded even if it's a null one"
 msgstr "总是保留至少有一个信宿被加载，即使它为空"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-equalizer-sink.c:68
 msgid "General Purpose Equalizer"
@@ -1083,11 +1325,19 @@ msgstr ""
 "format=<采样格式> rate=<采样率> channels=<声道数> channel_map=<声道映射> "
 "autoloaded=<若为自动加载则会设置> use_volume_sharing=<yes 或 no> "
 
+<<<<<<< HEAD
+#: src/modules/module-equalizer-sink.c:1094
+#: src/modules/module-equalizer-sink.c:1217
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr ""
+=======
 #: src/modules/module-equalizer-sink.c:1097
 #: src/modules/module-equalizer-sink.c:1220
 #, c-format
 msgid "FFT based equalizer on %s"
 msgstr "基于快速傅里叶变换的均衡器%s"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/module-filter-apply.c:47
 msgid "autoclean=<automatically unload unused filters?>"
@@ -1098,6 +1348,10 @@ msgid "Virtual LADSPA sink"
 msgstr "虚拟 LDASPA 信宿"
 
 #: src/modules/module-ladspa-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "sink_input_properties=<properties for the sink input> master=<name of sink "
@@ -1120,11 +1374,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "定时的空信宿"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "空输出"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "空输出"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "未能设置格式：无效的格式字串 %s"
@@ -1147,14 +1409,24 @@ msgstr "@HOSTNAME@ 中的音频"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "%s@%s 的通道"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "到远程信宿 %s/%s 的通道"
@@ -1164,6 +1436,10 @@ msgid "Virtual surround sink"
 msgstr "虚拟环绕声信宿"
 
 #: src/modules/module-virtual-surround-sink.c:54
+<<<<<<< HEAD
+#, fuzzy
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1182,9 +1458,20 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "未知的设备模型"
 
+<<<<<<< HEAD
+#: src/modules/raop/module-raop-discover.c:295
+#, fuzzy
+msgid "Unknown device model"
+msgstr "未知错误码"
+
+#: src/modules/raop/raop-sink.c:655
+msgid "RAOP standard profile"
+msgstr ""
+=======
 #: src/modules/raop/raop-sink.c:689
 msgid "RAOP standard profile"
 msgstr "远程音频输出协议规范文档"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #: src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
@@ -1393,7 +1680,10 @@ msgstr "上右后"
 #: src/pulse/channelmap.c:478 src/pulse/format.c:123 src/pulse/sample.c:177
 #: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
 #: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+<<<<<<< HEAD
+=======
 #: src/utils/pactl.c:483 src/utils/pactl.c:504
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "(invalid)"
 msgstr "(无效)"
 
@@ -1461,7 +1751,11 @@ msgid "invalid"
 msgstr "无效"
 
 #: src/pulsecore/core-util.c:1790
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 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, "
@@ -1498,11 +1792,19 @@ msgstr "尝试打开目标文件 '%s'，'%s.1'，'%s.2'…'%s.%d'，但均失败
 msgid "Invalid log target."
 msgstr "无效的日志目标。"
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "内置音频"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "内置音频"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "调制解调器"
 
@@ -1777,7 +2079,11 @@ msgstr "设置监视器流失败: %s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() 失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "连接失败：%s"
@@ -1948,7 +2254,11 @@ msgstr ""
 "使用 libpulse %s 编译\n"
 "与 libpulse %s 链接\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "无效的客户端名称 '%s'"
@@ -2019,7 +2329,11 @@ msgid ""
 "specification from file."
 msgstr "警告：指定的采样规格将覆盖文件中的说明。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "从文件中确定采样规格失败。"
 
@@ -2053,7 +2367,11 @@ msgstr "回放"
 msgid "Failed to set media name."
 msgstr "设置媒体名失败。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() 失败。"
 
@@ -2061,11 +2379,19 @@ msgstr "pa_mainloop_new() 失败。"
 msgid "io_new() failed."
 msgstr "io_new() 失败。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() 失败。"
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() 失败。"
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() 失败：%s"
@@ -2074,6 +2400,23 @@ msgstr "pa_context_connect() 失败：%s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() 失败。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() 失败。"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "名称 [参数 ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "名称|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() 失败。"
@@ -2089,6 +2432,7 @@ msgstr "名称|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "名称"
 
@@ -2100,7 +2444,11 @@ msgstr "名称|#N 音量"
 msgid "#N VOLUME"
 msgstr "#N 音量"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "名称|#N 1|0"
 
@@ -2136,7 +2484,11 @@ msgstr "路径名"
 msgid "FILENAME SINK|#N"
 msgstr "文件名 信宿|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N 信宿|信号源"
 
@@ -2144,6 +2496,17 @@ msgstr "#N 信宿|信号源"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "声卡配置文件"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "名称|#N 端口"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "声卡配置文件"
@@ -2153,6 +2516,7 @@ msgid "NAME|#N PORT"
 msgstr "名称|#N 端口"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "声卡名|卡号-#N 端口 偏移量"
 
@@ -2168,7 +2532,11 @@ msgstr "级别 (数字)"
 msgid "FRAMES"
 msgstr "FRAMES"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2233,19 +2601,31 @@ msgstr "poll()：%s"
 msgid "read(): %s"
 msgstr "read()：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "获取统计数据失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "当前使用：%u 块，总共 %s 字节。\n"
 msgstr[1] "当前使用：%u 块，总共 %s 字节。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
@@ -2253,22 +2633,38 @@ msgid_plural ""
 msgstr[0] "整个生命周期所得分配：%u 块，总共 %s 字节。\n"
 msgstr[1] "整个生命周期所得分配：%u 块，总共 %s 字节。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "采样缓存大小：%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "获取服务器信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2285,7 +2681,11 @@ msgstr ""
 "客户端索引：%u\n"
 "区块大小: %zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2308,6 +2708,21 @@ msgstr ""
 "默认信源： %s\n"
 "Cookie：%04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2321,28 +2736,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "未知"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "输入插孔"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "耳机"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2364,26 +2819,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "蓝牙输入"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "模拟单声道"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "获取音频出口信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2422,37 +2895,66 @@ msgstr ""
 "\t属性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\t端口：\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (信宿：%u，信源：%u，优先级：%u，可用性：%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\t活动端口：%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\t格式：\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "获取音频入口信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2491,6 +2993,17 @@ msgstr ""
 "\t属性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2500,11 +3013,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "获取模块信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2521,12 +3039,20 @@ msgstr ""
 "\t属性\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "获取客户端信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2541,12 +3067,20 @@ msgstr ""
 "\t属性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "获取声卡信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2563,28 +3097,48 @@ msgstr ""
 "\t属性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\t配置文件：\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (信宿：%u，信源：%u，优先级：%u，可用性：%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\t活动配置：%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2593,17 +3147,29 @@ msgstr ""
 "\t\t\t属性：\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\t属于配置文件：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "获取音频信宿输入信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2642,12 +3208,20 @@ msgstr ""
 "\t属性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "获取音频信源输出信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2686,12 +3260,20 @@ msgstr ""
 "\t属性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "获取采样信息失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2720,21 +3302,44 @@ msgstr ""
 "\t属性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() 失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr "无法正确分析列表处理程序消息响应"
@@ -2744,16 +3349,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr "列表处理程序消息响应不是JSON数组"
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "未能卸载模块：模块 %s 未加载"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2764,11 +3378,74 @@ msgid_plural ""
 msgstr[0] "设置音量失败：您尝试设置 %d 个声道的音量，而支持的声道数为 %d。\n"
 msgstr[1] "设置音量失败：您尝试设置 %d 个声道的音量，而支持的声道数为 %d。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "上传采样失败：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "文件过早结束"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "新"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "变更"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "移除"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "未知"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "信宿"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "信源"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "信宿-输入"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "信源-输出"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "模块"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "客户端"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "采样-缓冲"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "服务器"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "声卡"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "文件过早结束"
@@ -2826,10 +3503,78 @@ msgid "card"
 msgstr "声卡"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "事件“%s”于 %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "收到 SIGINT 信号，退出。"
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "无效采样规格"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "音量超出允许范围。\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "无效音量规格数。\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "无效音量规格。\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[选项]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[类型]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "文件名 [名称]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "名称 [信宿]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "名称|#N 音量 [音量 ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N 音量 [音量 ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "名称|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N 格式列表"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "收到 SIGINT 信号，退出。"
@@ -2895,6 +3640,7 @@ msgid "#N FORMATS"
 msgstr "#N 格式列表"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2905,8 +3651,13 @@ msgstr ""
 "指定名称 @DEFAULT_SINK@，@DEFAULT_SOURCE@ 和 @DEFAULT_MONITOR@\n"
 "可用于指定默认的信宿、信源和监视器。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -2925,7 +3676,11 @@ msgstr ""
 "  -s, --server=服务器                   要连接的服务器名\n"
 "  -n, --client-name=名称                向服务器提供的客户端自称\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2936,16 +3691,59 @@ msgstr ""
 "使用 libpulse %s 编译\n"
 "与 libpules %s 链接\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "无效的流名称 '%s'"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "不指定，或指定成下列之一：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "请指定要加载的采样文件"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "打开声音文件失败。"
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "警告：从文件中确定采样规格失败。"
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "您必须指定要播放的采样名"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "您必须指定要删除的采样名"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "您必须指定信宿输入索引和信宿"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "您必须指定信源输出索引和信源"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "必须指定模块名和参数。"
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "必须指定模块索引或名称"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "请指定要加载的采样文件"
@@ -2983,20 +3781,86 @@ msgid "You have to specify a module index or name"
 msgstr "必须指定模块索引或名称"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "不可指定多个信宿。必须指定一个布尔值。"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "无效挂起规范。"
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "无效挂起规范。"
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "不可指定多个信源。必须指定一个布尔值。"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "您必须指定声卡名称/索引和侧写名称"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "您必须指定信宿名称/索引和端口名称"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "必须指定接收器名"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "您必须指定信源名称/索引和端口名称"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "必须指定信号源索引"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+#, fuzzy
+msgid "You have to specify a sink name/index"
+msgstr "必须指定接收器名"
+
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "您必须指定信宿名称/索引和音量"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "必须指定信号源索引"
+
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "您必须指定源名称/索引和音量"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "您必须指定信宿输入索引和音量"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "无效信宿输入索引"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "您必须指定信源输出索引 (index) 和音量"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "无效信源输出索引"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "您必须指定声卡名称/索引和侧写名称"
@@ -3050,35 +3914,69 @@ msgid "Invalid source output index"
 msgstr "无效信源输出索引"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "您必须指定信宿名称/索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "无效静音说明"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "无效静音说明"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "您必须指定信源名称/索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "您必须指定信宿输入索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "无效信宿输入索引规格"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "无效信宿输入索引规格"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "您必须指定信源输出索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "无效信源输出索引说明"
+
+#: src/utils/pactl.c:2350
+#, fuzzy
+msgid "You have to specify at least an object path and a message name"
+msgstr "您必须指定信宿名称/索引和端口名称"
+
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "无效信源输出索引说明"
@@ -3088,19 +3986,36 @@ msgid "You have to specify at least an object path and a message name"
 msgstr "您必须指定对象路径和消息名称"
 
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
+<<<<<<< HEAD
+
+#: src/utils/pactl.c:2370
+=======
 "如果给出过多的参数，它们将被忽略。请注意，所有消息参数必须作为单个字符串提"
 "供。"
 
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "您必须指定信宿名称及以英文分号分隔的其所支持格式的列表"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "您必须指定声卡名称/索引、端口名称和延迟偏移"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "无法解析延迟偏移"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "您必须指定声卡名称/索引、端口名称和延迟偏移"
@@ -3110,6 +4025,7 @@ msgid "Could not parse latency offset"
 msgstr "无法解析延迟偏移"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "未指定有效的命令。"
 
@@ -3154,7 +4070,11 @@ msgid "WARNING: Child process terminated by signal %u\n"
 msgstr "警告：子进程被信号 %u 终止\n"
 
 #: src/utils/pasuspender.c:228
+<<<<<<< HEAD
+#, fuzzy, c-format
+=======
 #, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "%s [options] -- PROGRAM [ARGUMENTS ...]\n"
 "\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3bcb6d677..e4d770a6c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,11 @@ msgstr ""
 "Project-Id-Version: PulseAudio Volume Control\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
 "issues/new\n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2021-07-05 14:01+0300\n"
+=======
 "POT-Creation-Date: 2022-06-18 09:49+0300\n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 "PO-Revision-Date: 2020-01-11 13:49+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
 "Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
@@ -567,7 +571,11 @@ msgid "Line In"
 msgstr "線路輸入"
 
 #: src/modules/alsa/alsa-mixer.c:2713 src/modules/alsa/alsa-mixer.c:2797
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1886
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1956
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Microphone"
 msgstr "麥克風"
 
@@ -588,12 +596,20 @@ msgid "Internal Microphone"
 msgstr "內建麥克風"
 
 #: src/modules/alsa/alsa-mixer.c:2718 src/modules/alsa/alsa-mixer.c:2804
+<<<<<<< HEAD
+#: src/utils/pactl.c:295
+=======
 #: src/utils/pactl.c:343
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Radio"
 msgstr "無線電"
 
 #: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+<<<<<<< HEAD
+#: src/utils/pactl.c:296
+=======
 #: src/utils/pactl.c:344
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Video"
 msgstr "視訊"
 
@@ -630,12 +646,20 @@ msgid "No Bass Boost"
 msgstr "無低音增強"
 
 #: src/modules/alsa/alsa-mixer.c:2728
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1894 src/utils/pactl.c:285
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1964 src/utils/pactl.c:333
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Speaker"
 msgstr "喇叭"
 
 #: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+<<<<<<< HEAD
+#: src/utils/pactl.c:286
+=======
 #: src/utils/pactl.c:334
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headphones"
 msgstr "頭戴式耳機"
 
@@ -748,7 +772,11 @@ msgid "Stereo"
 msgstr "立體聲"
 
 #: src/modules/alsa/alsa-mixer.c:4576 src/modules/alsa/alsa-mixer.c:4734
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1874 src/utils/pactl.c:289
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Headset"
 msgstr "耳麥"
 
@@ -862,7 +890,11 @@ msgid "Mono Chat + 7.1 Surround"
 msgstr ""
 
 #: src/modules/alsa/alsa-mixer.c:4740 src/modules/alsa/module-alsa-card.c:197
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:2177
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Off"
 msgstr "關閉"
 
@@ -965,6 +997,67 @@ msgstr[0] ""
 "snd_pcm_mmap_begin() 傳回超出預期的大值：%lu bytes (%lu ms)。\n"
 "這很能是 ALSA 驅動程式「%s」的臭蟲。請回報這個問題給 ALSA 開發者。"
 
+<<<<<<< HEAD
+#: src/modules/bluetooth/module-bluez5-device.c:1867
+#: src/modules/bluetooth/module-bluez5-device.c:1893
+#: src/modules/bluetooth/module-bluez5-device.c:1900
+msgid "Bluetooth Input"
+msgstr "藍牙輸入"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1868
+#: src/modules/bluetooth/module-bluez5-device.c:1887
+msgid "Bluetooth Output"
+msgstr "藍牙輸出"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1880 src/utils/pactl.c:300
+msgid "Handsfree"
+msgstr "免持裝置"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1901
+msgid "Headphone"
+msgstr "頭戴式耳機"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1907 src/utils/pactl.c:299
+msgid "Portable"
+msgstr "可攜裝置"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1913 src/utils/pactl.c:301
+msgid "Car"
+msgstr "汽車"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1919 src/utils/pactl.c:302
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1925 src/utils/pactl.c:303
+msgid "Phone"
+msgstr "手機"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1972
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "高傳真播放裝置 (A2DP Sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1984
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "高傳真擷取裝置 (A2DP Source)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1996
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "耳機麥克風頭部 (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2009
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "耳機麥克風音訊閘道 (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2022
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "耳機麥克風頭部 (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2035
+=======
 #: src/modules/bluetooth/module-bluez5-device.c:1937
 #: src/modules/bluetooth/module-bluez5-device.c:1963
 #: src/modules/bluetooth/module-bluez5-device.c:1970
@@ -1024,6 +1117,7 @@ msgid "Handsfree Head Unit (HFP)"
 msgstr "耳機麥克風頭部 (HSP/HFP)"
 
 #: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handsfree Audio Gateway (HFP)"
 msgstr "耳機麥克風音訊閘道 (HSP/HFP)"
@@ -1121,11 +1215,19 @@ msgstr ""
 msgid "Clocked NULL sink"
 msgstr "Clocked Null sink"
 
+<<<<<<< HEAD
+#: src/modules/module-null-sink.c:338
+msgid "Null Output"
+msgstr "Null Output"
+
+#: src/modules/module-null-sink.c:350 src/utils/pactl.c:1297
+=======
 #: src/modules/module-null-sink.c:356
 msgid "Null Output"
 msgstr "Null Output"
 
 #: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "未能設定格式：無效的格式字串 %s"
@@ -1148,14 +1250,24 @@ msgstr "音效位於 @HOSTNAME@"
 
 #. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
 #. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:320
+#: src/modules/module-tunnel-source-new.c:305
+=======
 #: src/modules/module-tunnel-sink-new.c:370
 #: src/modules/module-tunnel-source-new.c:354
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "%s@%s 的穿隧道"
 
+<<<<<<< HEAD
+#: src/modules/module-tunnel-sink-new.c:564
+#: src/modules/module-tunnel-source-new.c:540
+=======
 #: src/modules/module-tunnel-sink-new.c:715
 #: src/modules/module-tunnel-source-new.c:684
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "前往 %s/%s 的穿隧道"
@@ -1185,7 +1297,11 @@ msgstr ""
 msgid "Unknown device model"
 msgstr "未知裝置型號"
 
+<<<<<<< HEAD
+#: src/modules/raop/raop-sink.c:655
+=======
 #: src/modules/raop/raop-sink.c:689
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RAOP standard profile"
 msgstr "RAOP 標準設定檔"
 
@@ -1501,11 +1617,19 @@ msgstr "試圖開啟目標檔「%s」、「%s.1」、「%s.2」...「%s.%d」，
 msgid "Invalid log target."
 msgstr "無效的紀錄目標。"
 
+<<<<<<< HEAD
+#: src/pulsecore/sink.c:3539
+msgid "Built-in Audio"
+msgstr "內部音效"
+
+#: src/pulsecore/sink.c:3544
+=======
 #: src/pulsecore/sink.c:3609
 msgid "Built-in Audio"
 msgstr "內部音效"
 
 #: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Modem"
 msgstr "數據機"
 
@@ -1780,7 +1904,11 @@ msgstr "無法設定監聽器串流：%s"
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() 失敗：%s"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:514 src/utils/pactl.c:1723
+=======
 #: src/utils/pacat.c:514 src/utils/pactl.c:2508
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Connection failure: %s"
 msgstr "連線失敗：%s"
@@ -1964,7 +2092,11 @@ msgstr ""
 "以 libpulse %s 編譯\n"
 "以 libpulse %s 連結\n"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:852 src/utils/pactl.c:1929
+=======
 #: src/utils/pacat.c:852 src/utils/pactl.c:2731
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "無效的客戶端名稱「%s」"
@@ -2035,7 +2167,11 @@ msgid ""
 "specification from file."
 msgstr "警告：指定的取樣規格將會覆寫從檔案得到的規格。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1091 src/utils/pactl.c:1994
+=======
 #: src/utils/pacat.c:1091 src/utils/pactl.c:2806
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "Failed to determine sample specification from file."
 msgstr "未能從檔案得知取樣規格。"
 
@@ -2069,7 +2205,11 @@ msgstr "播放控制"
 msgid "Failed to set media name."
 msgstr "未能設定媒體名稱。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1172 src/utils/pactl.c:2406
+=======
 #: src/utils/pacat.c:1172 src/utils/pactl.c:3218
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() 失敗。"
 
@@ -2077,11 +2217,19 @@ msgstr "pa_mainloop_new() 失敗。"
 msgid "io_new() failed."
 msgstr "io_new() 失敗。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1202 src/utils/pactl.c:2418
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() 失敗。"
+
+#: src/utils/pacat.c:1210 src/utils/pactl.c:2424
+=======
 #: src/utils/pacat.c:1202 src/utils/pactl.c:3230
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() 失敗。"
 
 #: src/utils/pacat.c:1210 src/utils/pactl.c:3236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() 失敗：%s"
@@ -2090,6 +2238,23 @@ msgstr "pa_context_connect() 失敗：%s"
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() 失敗。"
 
+<<<<<<< HEAD
+#: src/utils/pacat.c:1223 src/utils/pactl.c:2429
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() 失敗。"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:1847
+msgid "NAME [ARGS ...]"
+msgstr "NAME [ARGS ...]"
+
+#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856
+msgid "NAME|#N"
+msgstr "NAME|#N"
+
+#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1846
+#: src/utils/pactl.c:1853
+=======
 #: src/utils/pacat.c:1223 src/utils/pactl.c:3241
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() 失敗。"
@@ -2105,6 +2270,7 @@ msgstr "NAME|#N"
 
 #: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:2642
 #: src/utils/pactl.c:2649
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME"
 msgstr "NAME"
 
@@ -2116,7 +2282,11 @@ msgstr "NAME|#N VOLUME"
 msgid "#N VOLUME"
 msgstr "#N VOLUME"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1850
+=======
 #: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:2646
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "NAME|#N 1|0"
 msgstr "NAME|#N 1|0"
 
@@ -2152,7 +2322,11 @@ msgstr "PATHNAME"
 msgid "FILENAME SINK|#N"
 msgstr "FILENAME SINK|#N"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:69 src/utils/pactl.c:1849
+=======
 #: src/utils/pacmd.c:69 src/utils/pactl.c:2645
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "#N SINK|SOURCE"
 msgstr "#N SINK|SOURCE"
 
@@ -2160,6 +2334,17 @@ msgstr "#N SINK|SOURCE"
 msgid "1|0"
 msgstr "1|0"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
+msgid "CARD PROFILE"
+msgstr "CARD PROFILE"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:1854
+msgid "NAME|#N PORT"
+msgstr "NAME|#N PORT"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:1862
+=======
 #: src/utils/pacmd.c:72 src/utils/pactl.c:2647
 msgid "CARD PROFILE"
 msgstr "CARD PROFILE"
@@ -2169,6 +2354,7 @@ msgid "NAME|#N PORT"
 msgstr "NAME|#N PORT"
 
 #: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "CARD-NAME|CARD-#N PORT OFFSET"
 
@@ -2184,7 +2370,11 @@ msgstr "NUMERIC-LEVEL"
 msgid "FRAMES"
 msgstr "FRAMES"
 
+<<<<<<< HEAD
+#: src/utils/pacmd.c:80 src/utils/pactl.c:1863
+=======
 #: src/utils/pacmd.c:80 src/utils/pactl.c:2659
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "RECIPIENT MESSAGE [MESSAGE_PARAMETERS]"
 msgstr ""
 
@@ -2249,40 +2439,68 @@ msgstr "poll()：%s"
 msgid "read(): %s"
 msgstr "read()：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:175
+=======
 #: src/utils/pactl.c:183
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "未能取得統計：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:181
+=======
 #: src/utils/pactl.c:199
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Currently in use: %u block containing %s bytes total.\n"
 msgid_plural "Currently in use: %u blocks containing %s bytes total.\n"
 msgstr[0] "目前使用中：%u 個區塊共包含 %s bytes。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:187
+=======
 #: src/utils/pactl.c:205
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Allocated during whole lifetime: %u block containing %s bytes total.\n"
 msgid_plural ""
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr[0] "在整個生命週期間分配：%u 個區塊共包含 %s bytes。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:193
+=======
 #: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "取樣快取大小：%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:200 src/utils/pactl.c:212 src/utils/pactl.c:226
+=======
 #: src/utils/pactl.c:219 src/utils/pactl.c:231 src/utils/pactl.c:245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "未能取得伺服器資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:205 src/utils/pactl.c:217
+=======
 #: src/utils/pactl.c:224 src/utils/pactl.c:236
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "%s\n"
 msgstr "%s %s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:231
+=======
 #: src/utils/pactl.c:281
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2299,7 +2517,11 @@ msgstr ""
 "客戶端索引：%u\n"
 "Tile 大小：%zu\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:247
+=======
 #: src/utils/pactl.c:294
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2322,6 +2544,21 @@ msgstr ""
 "預設來源：%s\n"
 "Cookie：%04x:%04x\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:272
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:273
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:274
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
 #: src/utils/pactl.c:320
 msgid "availability unknown"
 msgstr ""
@@ -2335,28 +2572,68 @@ msgid "not available"
 msgstr ""
 
 #: src/utils/pactl.c:331 src/utils/pactl.c:355
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Unknown"
 msgstr "未知"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:284
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:287
+=======
 #: src/utils/pactl.c:332
 msgid "Aux"
 msgstr ""
 
 #: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Line"
 msgstr "線路輸入"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:288
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:290
+=======
 #: src/utils/pactl.c:336
 msgid "Mic"
 msgstr ""
 
 #: src/utils/pactl.c:338
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Handset"
 msgstr "耳麥"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:291
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:292
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:293
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:294
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:297
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:298
+=======
 #: src/utils/pactl.c:339
 msgid "Earpiece"
 msgstr ""
@@ -2378,26 +2655,44 @@ msgid "USB"
 msgstr ""
 
 #: src/utils/pactl.c:346
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Bluetooth"
 msgstr "藍牙輸入"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:304
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:305
+=======
 #: src/utils/pactl.c:352
 msgid "Network"
 msgstr ""
 
 #: src/utils/pactl.c:353
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "Analog"
 msgstr "類比單聲道"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:329 src/utils/pactl.c:1067 src/utils/pactl.c:1085
+#: src/utils/pactl.c:1108 src/utils/pactl.c:1225
+=======
 #: src/utils/pactl.c:567 src/utils/pactl.c:1834 src/utils/pactl.c:1852
 #: src/utils/pactl.c:1875 src/utils/pactl.c:1992
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "未能取得 sink 資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:355
+=======
 #: src/utils/pactl.c:664
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2436,37 +2731,66 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:399 src/utils/pactl.c:507 src/utils/pactl.c:670
+=======
 #: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\t連接埠：\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:401 src/utils/pactl.c:509
+=======
 #: src/utils/pactl.c:708 src/utils/pactl.c:892
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "\t\t%s: %s (type: %s, priority: %u%s%s, %s)\n"
 msgstr "\t\t%s: %s (sink：%u，來源：%u，優先序：%u，可用：%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:403 src/utils/pactl.c:511 src/utils/pactl.c:675
+msgid ", availability group: "
+msgstr ""
+
+#: src/utils/pactl.c:408 src/utils/pactl.c:516
+=======
 #: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
 msgid ", availability group: "
 msgstr ""
 
 #: src/utils/pactl.c:715 src/utils/pactl.c:899
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\t使用中連接埠：%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:414 src/utils/pactl.c:522
+=======
 #: src/utils/pactl.c:721 src/utils/pactl.c:905
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\t格式：\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:438 src/utils/pactl.c:1126 src/utils/pactl.c:1144
+#: src/utils/pactl.c:1167 src/utils/pactl.c:1240
+=======
 #: src/utils/pactl.c:753 src/utils/pactl.c:1893 src/utils/pactl.c:1911
 #: src/utils/pactl.c:1934 src/utils/pactl.c:2007
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "未能取得來源資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:464
+=======
 #: src/utils/pactl.c:849
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2505,6 +2829,17 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:492 src/utils/pactl.c:564 src/utils/pactl.c:607
+#: src/utils/pactl.c:649 src/utils/pactl.c:748 src/utils/pactl.c:749
+#: src/utils/pactl.c:760 src/utils/pactl.c:818 src/utils/pactl.c:819
+#: src/utils/pactl.c:830 src/utils/pactl.c:881 src/utils/pactl.c:882
+#: src/utils/pactl.c:888
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:533 src/utils/pactl.c:1026
+=======
 #: src/utils/pactl.c:877 src/utils/pactl.c:962 src/utils/pactl.c:1062
 #: src/utils/pactl.c:1232 src/utils/pactl.c:1384 src/utils/pactl.c:1385
 #: src/utils/pactl.c:1396 src/utils/pactl.c:1507 src/utils/pactl.c:1508
@@ -2514,11 +2849,16 @@ msgid "n/a"
 msgstr "n/a"
 
 #: src/utils/pactl.c:924 src/utils/pactl.c:1793
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "未能取得模組資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:556
+=======
 #: src/utils/pactl.c:976
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2535,12 +2875,20 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:575
+=======
 #: src/utils/pactl.c:1002
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "未能取得客戶端資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:601
+=======
 #: src/utils/pactl.c:1056
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2555,12 +2903,20 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:618
+=======
 #: src/utils/pactl.c:1168
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "未能取得音效卡資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:641
+=======
 #: src/utils/pactl.c:1224
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2577,28 +2933,48 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:657
+=======
 #: src/utils/pactl.c:1238
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\t個人設定檔：\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:659
+=======
 #: src/utils/pactl.c:1240
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (sink：%u，來源：%u，優先序：%u，可用：%s)\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:664
+=======
 #: src/utils/pactl.c:1245
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\t啟用的個人設定檔：%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:673
+=======
 #: src/utils/pactl.c:1254
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t%s: %s (type: %s, priority: %u, latency offset: %<PRId64> usec%s%s, %s)\n"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:679
+=======
 #: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2607,17 +2983,29 @@ msgstr ""
 "\t\t\t屬性：\n"
 "\t\t\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:684
+=======
 #: src/utils/pactl.c:1265
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\t個人設定檔之部分：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:701 src/utils/pactl.c:1187 src/utils/pactl.c:1255
+=======
 #: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "未能取得 sink 輸入資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:730
+=======
 #: src/utils/pactl.c:1366
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2656,12 +3044,20 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:771 src/utils/pactl.c:1207 src/utils/pactl.c:1270
+=======
 #: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "未能取得來源輸出資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:800
+=======
 #: src/utils/pactl.c:1489
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2700,12 +3096,20 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:841
+=======
 #: src/utils/pactl.c:1536
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "未能取得取樣資訊：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:868
+=======
 #: src/utils/pactl.c:1604
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2734,21 +3138,44 @@ msgstr ""
 "\t屬性：\n"
 "\t\t%s\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:896 src/utils/pactl.c:906
+=======
 #: src/utils/pactl.c:1633 src/utils/pactl.c:1643
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failure: %s"
 msgstr "失敗：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:919
+=======
 #: src/utils/pactl.c:1667
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy, c-format
 msgid "Send message failed: %s"
 msgstr "read() 失敗：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:936
+=======
 #: src/utils/pactl.c:1695
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message failed: %s"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:944 src/utils/pactl.c:993
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:951
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:962
+=======
 #: src/utils/pactl.c:1711 src/utils/pactl.c:1760
 msgid "list-handlers message response could not be parsed correctly"
 msgstr ""
@@ -2758,16 +3185,25 @@ msgid "list-handlers message response is not a JSON array"
 msgstr ""
 
 #: src/utils/pactl.c:1729
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "list-handlers message response array element %d is not a JSON object"
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1033
+=======
 #: src/utils/pactl.c:1800
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "無法取消模組載入：%s 模組無法載入"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1051
+=======
 #: src/utils/pactl.c:1818
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "Failed to set volume: You tried to set volumes for %d channel, whereas "
@@ -2777,11 +3213,74 @@ msgid_plural ""
 "channel(s) supported = %d\n"
 msgstr[0] "無法設定音量：您試圖設定 %d 個聲道的音量，而支援的聲道數為 = %d\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1340
+=======
 #: src/utils/pactl.c:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "未能上傳樣本：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1357
+msgid "Premature end of file"
+msgstr "未完成的檔案結尾"
+
+#: src/utils/pactl.c:1377
+msgid "new"
+msgstr "新增"
+
+#: src/utils/pactl.c:1380
+msgid "change"
+msgstr "變更"
+
+#: src/utils/pactl.c:1383
+msgid "remove"
+msgstr "移除"
+
+#: src/utils/pactl.c:1386 src/utils/pactl.c:1421
+msgid "unknown"
+msgstr "未知"
+
+#: src/utils/pactl.c:1394
+msgid "sink"
+msgstr "sink"
+
+#: src/utils/pactl.c:1397
+msgid "source"
+msgstr "source"
+
+#: src/utils/pactl.c:1400
+msgid "sink-input"
+msgstr "sink-input"
+
+#: src/utils/pactl.c:1403
+msgid "source-output"
+msgstr "source-output"
+
+#: src/utils/pactl.c:1406
+msgid "module"
+msgstr "module"
+
+#: src/utils/pactl.c:1409
+msgid "client"
+msgstr "client"
+
+#: src/utils/pactl.c:1412
+msgid "sample-cache"
+msgstr "sample-cache"
+
+#: src/utils/pactl.c:1415
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:1418
+msgid "card"
+msgstr "card"
+
+#: src/utils/pactl.c:1427
+=======
 #: src/utils/pactl.c:2124
 msgid "Premature end of file"
 msgstr "未完成的檔案結尾"
@@ -2839,10 +3338,78 @@ msgid "card"
 msgstr "card"
 
 #: src/utils/pactl.c:2206
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "事件「%s」 於  %s #%u\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1729
+msgid "Got SIGINT, exiting."
+msgstr "已取得 SIGINT，正在退出。"
+
+#: src/utils/pactl.c:1762
+msgid "Invalid volume specification"
+msgstr "無效的音量規格"
+
+#: src/utils/pactl.c:1785
+msgid "Volume outside permissible range.\n"
+msgstr "音量外部可允許範圍。\n"
+
+#: src/utils/pactl.c:1798
+msgid "Invalid number of volume specifications.\n"
+msgstr "無效的音量規格。\n"
+
+#: src/utils/pactl.c:1810
+msgid "Inconsistent volume specification.\n"
+msgstr "不一致的音量規格。\n"
+
+#: src/utils/pactl.c:1840 src/utils/pactl.c:1841 src/utils/pactl.c:1842
+#: src/utils/pactl.c:1843 src/utils/pactl.c:1844 src/utils/pactl.c:1845
+#: src/utils/pactl.c:1846 src/utils/pactl.c:1847 src/utils/pactl.c:1848
+#: src/utils/pactl.c:1849 src/utils/pactl.c:1850 src/utils/pactl.c:1851
+#: src/utils/pactl.c:1852 src/utils/pactl.c:1853 src/utils/pactl.c:1854
+#: src/utils/pactl.c:1855 src/utils/pactl.c:1856 src/utils/pactl.c:1857
+#: src/utils/pactl.c:1858 src/utils/pactl.c:1859 src/utils/pactl.c:1860
+#: src/utils/pactl.c:1861 src/utils/pactl.c:1862 src/utils/pactl.c:1863
+#: src/utils/pactl.c:1864
+msgid "[options]"
+msgstr "[選項]"
+
+#: src/utils/pactl.c:1842
+msgid "[TYPE]"
+msgstr "[TYPE]"
+
+#: src/utils/pactl.c:1844
+msgid "FILENAME [NAME]"
+msgstr "FILENAME [NAME]"
+
+#: src/utils/pactl.c:1845
+msgid "NAME [SINK]"
+msgstr "NAME [SINK]"
+
+#: src/utils/pactl.c:1857
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAME|#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1858
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N VOLUME [VOLUME ...]"
+
+#: src/utils/pactl.c:1859
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAME|#N 1|0|toggle"
+
+#: src/utils/pactl.c:1860
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:1861
+msgid "#N FORMATS"
+msgstr "#N FORMATS"
+
+#: src/utils/pactl.c:1865
+=======
 #: src/utils/pactl.c:2514
 msgid "Got SIGINT, exiting."
 msgstr "已取得 SIGINT，正在退出。"
@@ -2908,6 +3475,7 @@ msgid "#N FORMATS"
 msgstr "#N FORMATS"
 
 #: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "\n"
@@ -2918,8 +3486,13 @@ msgstr ""
 "特殊名稱 @DEFAULT_SINK@、@DEFAULT_SOURCE@ 和 @DEFAULT_MONITOR@\n"
 "可用來指定預設 sink、source 和 monitor。\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1868
+#, c-format
+=======
 #: src/utils/pactl.c:2664
 #, fuzzy, c-format
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "\n"
 "  -h, --help                            Show this help\n"
@@ -2939,7 +3512,11 @@ msgstr ""
 "  -s, --server=SERVER                   要連接的伺服器名稱\n"
 "  -n, --client-name=NAME                如何稱呼伺服器上的這個客戶端\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1909
+=======
 #: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2950,16 +3527,59 @@ msgstr ""
 "以 libpulse %s 編譯\n"
 "以 libpulse %s 連結\n"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1966
+=======
 #: src/utils/pactl.c:2751
 #, fuzzy, c-format
 msgid "Invalid format value '%s'"
 msgstr "無效的串流名稱「%s」"
 
 #: src/utils/pactl.c:2778
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "沒有指定，或者為右述之一：%s"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:1976
+msgid "Please specify a sample file to load"
+msgstr "請指定要載入的取樣檔"
+
+#: src/utils/pactl.c:1989
+msgid "Failed to open sound file."
+msgstr "未能開啟音效檔。"
+
+#: src/utils/pactl.c:2001
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "警告：未能從檔案得知取樣規格。"
+
+#: src/utils/pactl.c:2011
+msgid "You have to specify a sample name to play"
+msgstr "您必須指定一個要播放的樣本名稱"
+
+#: src/utils/pactl.c:2023
+msgid "You have to specify a sample name to remove"
+msgstr "您必須指定一個要移除的樣本名稱"
+
+#: src/utils/pactl.c:2032
+msgid "You have to specify a sink input index and a sink"
+msgstr "您必須指定一項 sink 輸入索引與一個 sink"
+
+#: src/utils/pactl.c:2042
+msgid "You have to specify a source output index and a source"
+msgstr "您必須指定一項來源輸出索引與一個來源"
+
+#: src/utils/pactl.c:2057
+msgid "You have to specify a module name and arguments."
+msgstr "您必須指定一個模組名稱與一些參數。"
+
+#: src/utils/pactl.c:2077
+msgid "You have to specify a module index or name"
+msgstr "您必須指定一個模組索引或名稱"
+
+#: src/utils/pactl.c:2090
+=======
 #: src/utils/pactl.c:2788
 msgid "Please specify a sample file to load"
 msgstr "請指定要載入的取樣檔"
@@ -2997,20 +3617,52 @@ msgid "You have to specify a module index or name"
 msgstr "您必須指定一個模組索引或名稱"
 
 #: src/utils/pactl.c:2902
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "您指定的 sink 數不能超過一個。您必須指定一項布林值。"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2095 src/utils/pactl.c:2115
+msgid "Invalid suspend specification."
+msgstr "無效的暫停規格。"
+
+#: src/utils/pactl.c:2110
+=======
 #: src/utils/pactl.c:2907 src/utils/pactl.c:2927
 msgid "Invalid suspend specification."
 msgstr "無效的暫停規格。"
 
 #: src/utils/pactl.c:2922
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "您指定的來源數不能超過一個。您必須指定一項布林值。"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2127
+msgid "You have to specify a card name/index and a profile name"
+msgstr "您必須指定一個音效卡名稱/索引，以及設定組合名稱"
+
+#: src/utils/pactl.c:2138
+msgid "You have to specify a sink name/index and a port name"
+msgstr "您必須指定一個 sink 名稱/索引，以及連接埠名稱"
+
+#: src/utils/pactl.c:2149
+msgid "You have to specify a sink name"
+msgstr "您必須指定 sink 名稱"
+
+#: src/utils/pactl.c:2162
+msgid "You have to specify a source name/index and a port name"
+msgstr "您必須指定一個來源名稱/索引，以及連接埠名稱"
+
+#: src/utils/pactl.c:2173
+msgid "You have to specify a source name"
+msgstr "您必須指定 source 名稱"
+
+#: src/utils/pactl.c:2186 src/utils/pactl.c:2264
+=======
 #: src/utils/pactl.c:2939
 msgid "You have to specify a card name/index and a profile name"
 msgstr "您必須指定一個音效卡名稱/索引，以及設定組合名稱"
@@ -3032,19 +3684,51 @@ msgid "You have to specify a source name"
 msgstr "您必須指定 source 名稱"
 
 #: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a sink name/index"
 msgstr "您必須指定 sink 名稱"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2196
+msgid "You have to specify a sink name/index and a volume"
+msgstr "您必須指定一個 sink 名稱/索引，以及一項音量"
+
+#: src/utils/pactl.c:2209 src/utils/pactl.c:2289
+=======
 #: src/utils/pactl.c:3008
 msgid "You have to specify a sink name/index and a volume"
 msgstr "您必須指定一個 sink 名稱/索引，以及一項音量"
 
 #: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify a source name/index"
 msgstr "您必須指定 source 名稱"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2219
+msgid "You have to specify a source name/index and a volume"
+msgstr "您必須指定一個來源名稱/索引，以及一項音量"
+
+#: src/utils/pactl.c:2232
+msgid "You have to specify a sink input index and a volume"
+msgstr "您必須指定一個 sink 輸入索引，以及一項音量"
+
+#: src/utils/pactl.c:2237
+msgid "Invalid sink input index"
+msgstr "無效的 sink 輸入索引"
+
+#: src/utils/pactl.c:2248
+msgid "You have to specify a source output index and a volume"
+msgstr "您必須指定一個來源輸出索引，以及一項音量"
+
+#: src/utils/pactl.c:2253
+msgid "Invalid source output index"
+msgstr "無效的來源輸出索引"
+
+#: src/utils/pactl.c:2274
+=======
 #: src/utils/pactl.c:3031
 msgid "You have to specify a source name/index and a volume"
 msgstr "您必須指定一個來源名稱/索引，以及一項音量"
@@ -3066,56 +3750,105 @@ msgid "Invalid source output index"
 msgstr "無效的來源輸出索引"
 
 #: src/utils/pactl.c:3086
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "您必須指定 sink 名稱/索引與靜音動作（0, 1, 或「toggle」）"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2279 src/utils/pactl.c:2304 src/utils/pactl.c:2324
+#: src/utils/pactl.c:2342
+msgid "Invalid mute specification"
+msgstr "無效的靜音規格"
+
+#: src/utils/pactl.c:2299
+=======
 #: src/utils/pactl.c:3091 src/utils/pactl.c:3116 src/utils/pactl.c:3136
 #: src/utils/pactl.c:3154
 msgid "Invalid mute specification"
 msgstr "無效的靜音規格"
 
 #: src/utils/pactl.c:3111
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "您必須指定來源名稱/索引與靜音動作（0, 1, 或「toggle」）"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2314
+=======
 #: src/utils/pactl.c:3126
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "您必須指定 sink 輸入索引與靜音動作（0, 1, 或「toggle」）"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2319
+msgid "Invalid sink input index specification"
+msgstr "無效的 sink 輸入索引規格"
+
+#: src/utils/pactl.c:2332
+=======
 #: src/utils/pactl.c:3131
 msgid "Invalid sink input index specification"
 msgstr "無效的 sink 輸入索引規格"
 
 #: src/utils/pactl.c:3144
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "您必須指定來源輸出索引與靜音動作（0, 1, 或「toggle」）"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2337
+msgid "Invalid source output index specification"
+msgstr "無效的來源輸出索引規格"
+
+#: src/utils/pactl.c:2350
+=======
 #: src/utils/pactl.c:3149
 msgid "Invalid source output index specification"
 msgstr "無效的來源輸出索引規格"
 
 #: src/utils/pactl.c:3162
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #, fuzzy
 msgid "You have to specify at least an object path and a message name"
 msgstr "您必須指定一個 sink 名稱/索引，以及連接埠名稱"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2360
+=======
 #: src/utils/pactl.c:3172
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "Excess arguments given, they will be ignored. Note that all message "
 "parameters must be given as a single string."
 msgstr ""
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2370
+=======
 #: src/utils/pactl.c:3182
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "您必須指定一個 sink 索引，以及一份以半形分號分隔、列有支援格式的清單"
 
+<<<<<<< HEAD
+#: src/utils/pactl.c:2382
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr "您必須指定音效卡名稱/索引、連接埠名稱和延遲偏移"
+
+#: src/utils/pactl.c:2389
+msgid "Could not parse latency offset"
+msgstr "無法解析延遲偏移"
+
+#: src/utils/pactl.c:2401
+=======
 #: src/utils/pactl.c:3194
 msgid "You have to specify a card name/index, a port name and a latency offset"
 msgstr "您必須指定音效卡名稱/索引、連接埠名稱和延遲偏移"
@@ -3125,6 +3858,7 @@ msgid "Could not parse latency offset"
 msgstr "無法解析延遲偏移"
 
 #: src/utils/pactl.c:3213
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 msgid "No valid command specified."
 msgstr "沒有指定有效的命令。"
 
diff --git a/scripts/generate-map-file.sh b/scripts/generate-map-file.sh
index 2c8f015ac..390100e0a 100755
--- a/scripts/generate-map-file.sh
+++ b/scripts/generate-map-file.sh
@@ -17,6 +17,12 @@ print_map_file() {
     echo "};"
 }
 
+<<<<<<< HEAD
+TARGET_FILE=$1
+shift
+
+cd "${MESON_SOURCE_ROOT}/${MESON_SUBDIR}" && print_map_file "$@" > ${TARGET_FILE}
+=======
 print_def_file() {
     echo "EXPORTS"
     ctags -I ${CTAGS_IDENTIFIER_LIST} -f - --c-kinds=p "$@" | awk '/^pa_/ && !/(^pa_glib_|^pa_simple_)/ { print $1 }' | sort
@@ -28,3 +34,4 @@ shift 2
 
 cd "${MESON_SOURCE_ROOT}/${MESON_SUBDIR}" && print_map_file "$@" > ${MAP_FILE}
 cd "${MESON_SOURCE_ROOT}/${MESON_SUBDIR}" && print_def_file "$@" > ${DEF_FILE}
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index fb406551b..de1733421 100644
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -1,5 +1,24 @@
 if bashcompletiondir != 'no'
   aliases = []
+<<<<<<< HEAD
+
+  if get_option('daemon')
+    aliases += [
+      'pacmd',
+      'pasuspender',
+    ]
+  endif
+
+  aliases += [
+    'pacat',
+    'pactl',
+    'padsp',
+    'paplay',
+    'parec',
+    'parecord',
+  ]
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
   if get_option('daemon')
     aliases += [
diff --git a/shell-completion/bash/pactl b/shell-completion/bash/pactl
index 050fe7d58..44e0f59bb 100644
--- a/shell-completion/bash/pactl
+++ b/shell-completion/bash/pactl
@@ -120,9 +120,15 @@ _pactl() {
                     set-default-sink set-sink-port get-default-source set-default-source
                     set-source-port get-sink-volume set-sink-volume get-source-volume
                     set-source-volume set-sink-input-volume set-source-output-volume
+<<<<<<< HEAD:shell-completion/bash/pulseaudio
+                    set-sink-mute set-source-mute set-sink-input-mute
+                    set-source-output-mute set-sink-formats set-port-latency-offset
+                    subscribe send-message help)
+=======
                     get-sink-mute set-sink-mute get-source-mute set-source-mute
                     set-sink-input-mute set-source-output-mute set-sink-formats
                     set-port-latency-offset subscribe send-message help)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336:shell-completion/bash/pactl
 
     _init_completion -n = || return
     preprev=${words[$cword-2]}
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 81dfe7103..53ad87e64 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -171,6 +171,9 @@ load-module module-filter-apply
 
 ### Allow including a default.pa.d directory, which if present, can be used
 ### for additional configuration snippets.
+<<<<<<< HEAD
+=======
 ### Note that those snippet files must have a .pa file extension, not .conf
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 .nofail
 .include @PA_DEFAULT_CONFIG_DIR_UNQUOTED@/default.pa.d
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 31e36ec01..bd317b56a 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -30,8 +30,13 @@ executable('pulseaudio',
   install_rpath : privlibdir,
   include_directories : [configinc, topinc],
   link_args : ['-ffast-math'],
+<<<<<<< HEAD
+  link_with : [libpulsecore, libpulsecommon, libpulse],
+  dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep, platform_dep, platform_socket_dep],
+=======
   link_with : [libpulsecore],
   dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep, platform_dep, platform_socket_dep, libpulsecommon_dep, libpulse_dep],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   c_args : pa_c_args,
 )
 
diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index 795045bd4..cafc64aa1 100755
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -69,6 +69,9 @@ load-module module-position-event-sounds
 
 ### Allow including a system.pa.d directory, which if present, can be used
 ### for additional configuration snippets.
+<<<<<<< HEAD
+=======
 ### Note that those snippet files must have a .pa file extension, not .conf
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 .nofail
 .include @PA_DEFAULT_CONFIG_DIR_UNQUOTED@/system.pa.d
diff --git a/src/meson.build b/src/meson.build
index 2069d2803..580e0983c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -182,6 +182,29 @@ if host_machine.system() == 'windows'
 else
   libpulsecommon_sources += [
     'pulsecore/mutex-posix.c',
+<<<<<<< HEAD
+    'pulsecore/semaphore-posix.c',
+    'pulsecore/thread-posix.c'
+  ]
+endif
+# FIXME: Do SIMD things
+
+libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
+  libpulsecommon_sources,
+  libpulsecommon_headers,
+  include_directories : [configinc, topinc],
+  c_args : [pa_c_args],
+  link_args : [nodelete_link_args],
+  install : true,
+  install_dir : privlibdir,
+  dependencies : [
+    libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
+    x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true),
+    gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep,
+    platform_dep, tcpwrap_dep, platform_socket_dep, execinfo_dep,
+  ],
+  implicit_include_directories : false)
+=======
     'pulsecore/poll-posix.c',
     'pulsecore/thread-posix.c',
   ]
@@ -215,10 +238,15 @@ else
     implicit_include_directories : false)
 
   libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
   subdir('pulse')
 endif
 
+<<<<<<< HEAD
+subdir('pulse')
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 if get_option('daemon')
   subdir('pulsecore')
   subdir('daemon')
diff --git a/src/modules/alsa/90-pulseaudio.rules b/src/modules/alsa/90-pulseaudio.rules
index cce25b251..ba0df225e 100644
--- a/src/modules/alsa/90-pulseaudio.rules
+++ b/src/modules/alsa/90-pulseaudio.rules
@@ -107,15 +107,22 @@ ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1011", ENV{PULSE_PROFILE_SET}="nativ
 
 
 ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1001", ENV{PULSE_PROFILE_SET}="native-instruments-komplete-audio6.conf"
+<<<<<<< HEAD
+=======
 # This entry is for the Komplete Audio 6 MK2, which has a different ID, but is functionally identical to the Komplete Audio 6.
 ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1870", ENV{PULSE_PROFILE_SET}="native-instruments-komplete-audio6.conf"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1021", ENV{PULSE_PROFILE_SET}="native-instruments-traktor-audio10.conf"
 ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf"
 ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinect-audio.conf"
 ATTRS{idVendor}=="041e", ATTRS{idProduct}=="322c", ENV{PULSE_PROFILE_SET}="sb-omni-surround-5.1.conf"
 ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf"
 ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="402e", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf"
+<<<<<<< HEAD
+ATTRS{idVendor}=="08bb", ATTRS{idProduct}=="2902", ENV{PULSE_PROFILE_SET}="behringer-umc22.conf"
+=======
 ATTRS{idVendor}=="08bb", ATTRS{idProduct}=="2902", ENV{PULSE_PROFILE_SET}="texas-instruments-pcm2902.conf"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="0269", ENV{PULSE_PROFILE_SET}="hp-tbt-dock-120w-g2.conf"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="0567", ENV{PULSE_PROFILE_SET}="hp-tbt-dock-audio-module.conf"
 
@@ -125,8 +132,11 @@ ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1260", ENV{PULSE_PROFILE_SET}="usb-g
 ATTRS{idVendor}=="1038", ATTRS{idProduct}=="12ad", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
 ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1294", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
 ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1730", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
+<<<<<<< HEAD
+=======
 # ID 1038:1282 is for SteelSeries GameDAC
 ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1282", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 # ID 1038:12c4 is for Arctis 9
 ATTRS{idVendor}=="1038", ATTRS{idProduct}=="12c4", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
 # Lucidsound LS31
@@ -168,6 +178,8 @@ ATTRS{idVendor}=="1395", ATTRS{idProduct}=="00a0", ENV{PULSE_PROFILE_SET}="sennh
 ATTRS{idVendor}=="1395", ATTRS{idProduct}=="005f", ENV{PULSE_PROFILE_SET}="sennheiser-gsx.conf"
 ATTRS{idVendor}=="1395", ATTRS{idProduct}=="00a1", ENV{PULSE_PROFILE_SET}="sennheiser-gsx.conf"
 
+<<<<<<< HEAD
+=======
 # Sennheiser GSA 70 wireless USB dongle for GSP 670
 ATTRS{idVendor}=="1395", ATTRS{idProduct}=="0089", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
 # EPOS GSA 70 wireless USB dongle for GSP 670 (Sennheiser GSA 70 with updated firmware)
@@ -178,6 +190,7 @@ ATTRS{idVendor}=="1395", ATTRS{idProduct}=="008a", ENV{PULSE_PROFILE_SET}="usb-g
 # Asus Xonar SE
 ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="189d", ENV{PULSE_PROFILE_SET}="asus-xonar-se.conf"
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 GOTO="pulseaudio_end"
 
 LABEL="pulseaudio_check_pci"
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 4f51cfb4d..e4d73b7fe 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2851,22 +2851,43 @@ static int path_verify(pa_alsa_path *p) {
     return 0;
 }
 
+<<<<<<< HEAD
+static char *get_path_config_path(const char *paths_dir, const char *fname) {
+    char *path_config_path;
+=======
 static char *get_data_path(const char *data_dir, const char *data_type, const char *fname) {
     char *result;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     char *dir;
     char *data_home;
     pa_dynarray *data_dirs;
 
+<<<<<<< HEAD
+    if (paths_dir) {
+        path_config_path = pa_maybe_prefix_path(fname, paths_dir);
+        if (access(path_config_path, R_OK) == 0)
+            return path_config_path;
+        else
+            pa_xfree(path_config_path);
+=======
     if (data_dir) {
         result = pa_maybe_prefix_path(fname, data_dir);
         if (access(result, R_OK) == 0)
             return result;
         else
             pa_xfree(result);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 
 #ifdef HAVE_RUNNING_FROM_BUILD_TREE
     if (pa_run_from_build_tree()) {
+<<<<<<< HEAD
+        path_config_path = pa_maybe_prefix_path(fname, PA_SRCDIR "/modules/alsa/mixer/paths/");
+        if (access(path_config_path, R_OK) == 0)
+            return path_config_path;
+        else
+            pa_xfree(path_config_path);
+=======
         dir = pa_sprintf_malloc(PA_SRCDIR "/modules/alsa/mixer/%s/", data_type);
         result = pa_maybe_prefix_path(fname, dir);
         pa_xfree(dir);
@@ -2875,10 +2896,23 @@ static char *get_data_path(const char *data_dir, const char *data_type, const ch
             return result;
         else
             pa_xfree(result);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 #endif
 
     if (pa_get_data_home_dir(&data_home) == 0) {
+<<<<<<< HEAD
+        dir = pa_sprintf_malloc("%s" PA_PATH_SEP "alsa-mixer" PA_PATH_SEP "paths", data_home);
+        pa_xfree(data_home);
+
+        path_config_path = pa_maybe_prefix_path(fname, dir);
+        pa_xfree(dir);
+
+        if (access(path_config_path, R_OK) == 0)
+            return path_config_path;
+        else
+            pa_xfree(path_config_path);
+=======
         dir = pa_sprintf_malloc("%s" PA_PATH_SEP "alsa-mixer" PA_PATH_SEP "%s", data_home, data_type);
         pa_xfree(data_home);
 
@@ -2889,6 +2923,7 @@ static char *get_data_path(const char *data_dir, const char *data_type, const ch
             return result;
         else
             pa_xfree(result);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 
     if (pa_get_data_dirs(&data_dirs) == 0) {
@@ -2896,6 +2931,18 @@ static char *get_data_path(const char *data_dir, const char *data_type, const ch
         const char *n;
 
         PA_DYNARRAY_FOREACH(n, data_dirs, idx) {
+<<<<<<< HEAD
+            dir = pa_sprintf_malloc("%s" PA_PATH_SEP "alsa-mixer" PA_PATH_SEP "paths", n);
+            path_config_path = pa_maybe_prefix_path(fname, dir);
+            pa_xfree(dir);
+
+            if (access(path_config_path, R_OK) == 0) {
+                pa_dynarray_free(data_dirs);
+                return path_config_path;
+            }
+            else {
+                pa_xfree(path_config_path);
+=======
             dir = pa_sprintf_malloc("%s" PA_PATH_SEP "alsa-mixer" PA_PATH_SEP "%s", n, data_type);
             result = pa_maybe_prefix_path(fname, dir);
             pa_xfree(dir);
@@ -2906,17 +2953,23 @@ static char *get_data_path(const char *data_dir, const char *data_type, const ch
             }
             else {
                 pa_xfree(result);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             }
         }
 
         pa_dynarray_free(data_dirs);
     }
 
+<<<<<<< HEAD
+    path_config_path = pa_maybe_prefix_path(fname, PA_ALSA_PATHS_DIR);
+    return path_config_path;
+=======
     dir = pa_sprintf_malloc(PA_ALSA_DATA_DIR PA_PATH_SEP "%s", data_type);
     result = pa_maybe_prefix_path(fname, dir);
     pa_xfree(dir);
 
     return result;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 }
 
 pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa_direction_t direction) {
@@ -2983,7 +3036,11 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
     items[2].data = &p->description;
     items[3].data = &mute_during_activation;
 
+<<<<<<< HEAD
+    fn = get_path_config_path(paths_dir, fname);
+=======
     fn = get_data_path(paths_dir, "paths", fname);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_log_info("Loading path config: %s", fn);
 
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index ca22f195f..3b4639636 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -2350,11 +2350,15 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
     bool volume_is_set;
     bool mute_is_set;
     pa_alsa_profile_set *profile_set = NULL;
+<<<<<<< HEAD
+    void *state;
+=======
     void *state = NULL;
 #ifdef USE_SMOOTHER_2
     snd_pcm_info_t* pcm_info;
     const char *id;
 #endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_assert(m);
     pa_assert(ma);
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 018c01739..2d2622e97 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -1085,10 +1085,17 @@ static void probe_volumes(pa_hashmap *hash, bool is_sink, snd_pcm_t *pcm_handle,
         PA_HASHMAP_FOREACH_KV(verb_name, path, data->paths, state2) {
             if (pa_alsa_path_probe(path, NULL, mixer_handle, ignore_dB) < 0) {
                 pa_log_warn("Could not probe path: %s, using s/w volume", path->name);
+<<<<<<< HEAD
+                pa_hashmap_remove(data->paths, profile);
+            } else if (!path->has_volume) {
+                pa_log_warn("Path %s is not a volume control", path->name);
+                pa_hashmap_remove(data->paths, profile);
+=======
                 pa_hashmap_remove(data->paths, verb_name);
             } else if (!path->has_volume && !path->has_mute) {
                 pa_log_warn("Path %s is not a volume or mute control", path->name);
                 pa_hashmap_remove(data->paths, verb_name);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             } else
                 pa_log_debug("Set up h/w %s using '%s' for %s:%s", path->has_volume ? "volume" : "mute",
                                 path->name, verb_name, port->name);
@@ -1706,11 +1713,29 @@ static void alsa_mapping_add_ucm_modifier(pa_alsa_mapping *m, pa_alsa_ucm_modifi
         pa_channel_map_init(&m->channel_map);
 }
 
+<<<<<<< HEAD
+static pa_alsa_mapping* ucm_alsa_mapping_get(pa_alsa_ucm_config *ucm, pa_alsa_profile_set *ps, const char *verb_name, const char *device_str, bool is_sink) {
+    pa_alsa_mapping *m;
+    char *mapping_name;
+    size_t ucm_alibpref_len = 0;
+    const char *value;
+
+    /* find private alsa-lib's configuration device prefix */
+    if (snd_use_case_get(ucm->ucm_mgr, "_alibpref", &value) == 0) {
+        if (value[0] && pa_startswith(device_str, value))
+            ucm_alibpref_len = strlen(value);
+
+        free((void *)value);
+    }
+
+    mapping_name = pa_sprintf_malloc("Mapping %s: %s: %s", verb_name, device_str + ucm_alibpref_len, is_sink ? "sink" : "source");
+=======
 static pa_alsa_mapping* ucm_alsa_mapping_get(pa_alsa_ucm_config *ucm, pa_alsa_profile_set *ps, const char *verb_name, const char *ucm_name, bool is_sink) {
     pa_alsa_mapping *m;
     char *mapping_name;
 
     mapping_name = pa_sprintf_malloc("Mapping %s: %s: %s", verb_name, ucm_name, is_sink ? "sink" : "source");
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     m = pa_alsa_mapping_get(ps, mapping_name);
 
@@ -1734,7 +1759,11 @@ static int ucm_create_mapping_direction(
     pa_alsa_mapping *m;
     unsigned priority, rate, channels;
 
+<<<<<<< HEAD
+    m = ucm_alsa_mapping_get(ucm, ps, verb_name, device_str, is_sink);
+=======
     m = ucm_alsa_mapping_get(ucm, ps, verb_name, device_name, is_sink);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     if (!m)
         return -1;
@@ -1782,10 +1811,19 @@ static int ucm_create_mapping_for_modifier(
 
     pa_alsa_mapping *m;
 
+<<<<<<< HEAD
+    m = ucm_alsa_mapping_get(ucm, ps, verb_name, device_str, is_sink);
+
+    if (!m)
+        return -1;
+
+    pa_log_info("UCM mapping: %s modifier %s", m->name, mod_name);
+=======
     m = ucm_alsa_mapping_get(ucm, ps, verb_name, mod_name, is_sink);
 
     if (!m)
         return -1;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_log_info("UCM mapping: %s modifier %s", m->name, mod_name);
 
@@ -2196,10 +2234,16 @@ static void ucm_mapping_jack_probe(pa_alsa_mapping *m, pa_hashmap *mixers) {
     if (!dev->jack || !dev->jack->mixer_device_name)
         return;
 
+<<<<<<< HEAD
+        has_control = pa_alsa_mixer_find_card(mixer_handle, &dev->jack->alsa_id, 0) != NULL;
+        pa_alsa_jack_set_has_control(dev->jack, has_control);
+        pa_log_info("UCM jack %s has_control=%d", dev->jack->name, dev->jack->has_control);
+=======
     mixer_handle = pa_alsa_open_mixer_by_name(mixers, dev->jack->mixer_device_name, true);
     if (!mixer_handle) {
         pa_log_error("Unable to determine open mixer device '%s' for jack %s", dev->jack->mixer_device_name, dev->jack->name);
         return;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 
     has_control = pa_alsa_mixer_find_card(mixer_handle, &dev->jack->alsa_id, 0) != NULL;
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index d3c092f52..70e1b36a5 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -1684,7 +1684,11 @@ static snd_mixer_elem_t *pa_alsa_mixer_find(snd_mixer_t *mixer,
 }
 
 snd_mixer_elem_t *pa_alsa_mixer_find_card(snd_mixer_t *mixer, struct pa_alsa_mixer_id *alsa_id, unsigned int device) {
+<<<<<<< HEAD
+    return pa_alsa_mixer_find(mixer, SND_CTL_ELEM_IFACE_CARD, alsa_id->name, alsa_id->index, device);
+=======
     return pa_alsa_mixer_find(mixer, SND_CTL_ELEM_IFACE_CARD, alsa_id->name, alsa_id->index, device, 0);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 }
 
 snd_mixer_elem_t *pa_alsa_mixer_find_pcm(snd_mixer_t *mixer, const char *name, unsigned int device) {
@@ -1852,6 +1856,29 @@ snd_mixer_t *pa_alsa_open_mixer_by_name(pa_hashmap *mixers, const char *dev, boo
     pa_assert(dev);
 
     pm = pa_hashmap_get(mixers, dev);
+<<<<<<< HEAD
+
+    /* The quick card number/index lookup (hw:#)
+     * We already know the card number/index, thus use the mixer
+     * from the cache at first.
+     */
+    if (!pm && pa_strneq(dev, "hw:", 3)) {
+        const char *s = dev + 3;
+        int card_index;
+        while (*s && *s >= '0' && *s <= '9') s++;
+        if (*s == '\0' && pa_atoi(dev + 3, &card_index) >= 0) {
+            PA_HASHMAP_FOREACH_KV(dev2, pm, mixers, state) {
+                if (pm->card_index == card_index) {
+                    dev = dev2;
+                    pm = pa_hashmap_get(mixers, dev);
+                    break;
+                }
+            }
+        }
+    }
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (pm) {
         if (!probe)
             pm->used_for_probe_only = false;
diff --git a/src/modules/alsa/mixer/profile-sets/behringer-umc22.conf b/src/modules/alsa/mixer/profile-sets/behringer-umc22.conf
new file mode 100644
index 000000000..cc74852c3
--- /dev/null
+++ b/src/modules/alsa/mixer/profile-sets/behringer-umc22.conf
@@ -0,0 +1,68 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+
+; Behringer U-Phoria UMC22
+;
+; Default mapping only allows to use stereo input and sound card has two
+; physical input channels.
+;
+; However in case of only using a single input channel (like condenser
+; microphone) only one channel will have any sound, which is often
+; inconvenient for casual use.
+;
+; This config includes mono input options which makes it much more
+; friendly in single input configuration.
+;
+; This config also removes default digital input/output mappings that do
+; not physically exist on this card.
+;
+; Added by Nazar Mokrynskyi <nazar@mokrynskyi.com>
+
+[General]
+auto-profiles = yes
+
+[Mapping analog-stereo-input]
+device-strings = hw:%f
+channel-map = left,right
+paths-input = analog-input-mic
+direction = input
+priority = 4
+
+[Mapping analog-mono]
+device-strings = hw:%f
+channel-map = mono,mono
+paths-input = analog-input-mic
+direction = input
+priority = 3
+
+[Mapping analog-mono-left]
+device-strings = hw:%f
+channel-map = mono,aux1
+paths-input = analog-input-mic
+direction = input
+priority = 2
+
+[Mapping analog-mono-right]
+device-strings = hw:%f
+channel-map = aux1,mono
+paths-input = analog-input-mic
+direction = input
+priority = 1
+
+[Mapping analog-stereo-output]
+device-strings = front:%f
+channel-map = left,right
+paths-output = analog-output
+direction = output
diff --git a/src/modules/alsa/mixer/profile-sets/native-instruments-komplete-audio6.conf b/src/modules/alsa/mixer/profile-sets/native-instruments-komplete-audio6.conf
index c5dab4d23..643502e00 100644
--- a/src/modules/alsa/mixer/profile-sets/native-instruments-komplete-audio6.conf
+++ b/src/modules/alsa/mixer/profile-sets/native-instruments-komplete-audio6.conf
@@ -39,7 +39,11 @@ channel-map = aux0,aux1,left,right,aux2,aux3
 direction = output
 
 [Mapping stereo-out-ef]
+<<<<<<< HEAD
+description = Analog Stereo 5/6
+=======
 description = Stereo 5/6 (S/PDIF)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 device-strings = hw:%f,0,0
 channel-map = aux0,aux1,aux2,aux3,left,right
 direction = output
@@ -51,7 +55,11 @@ channel-map = mono,aux0,aux1,aux2,aux3,aux4
 direction = input
 
 [Mapping analog-mono-in-b]
+<<<<<<< HEAD
+description = Anlog Mono Input 2
+=======
 description = Analog Mono Input 2
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 device-strings = hw:%f,0,0
 channel-map = aux0,mono,aux1,aux2,aux3,aux4
 direction = input
@@ -69,7 +77,11 @@ channel-map = aux0,aux1,left,right,aux2,aux3
 direction = input
 
 [Mapping stereo-in-ef]
+<<<<<<< HEAD
+description = Stereo Input 5/6
+=======
 description = Stereo Input 5/6 (S/PDIF)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 device-strings = hw:%f,0,0
 channel-map = aux0,aux1,aux2,aux3,left,right
 direction = input
diff --git a/src/modules/bluetooth/a2dp-codec-api.h b/src/modules/bluetooth/a2dp-codec-api.h
index e46981836..25cf71d4b 100644
--- a/src/modules/bluetooth/a2dp-codec-api.h
+++ b/src/modules/bluetooth/a2dp-codec-api.h
@@ -45,6 +45,9 @@ typedef struct pa_a2dp_endpoint_conf {
     /* Returns true if the codec can be supported on the system */
     bool (*can_be_supported)(bool for_encoding);
 
+    /* Returns true if the codec can be supported on the system */
+    bool (*can_be_supported)(bool for_encoding);
+
     /* Returns true if codec accepts capabilities, for_encoding is true when
      * capabilities are used for encoding */
     bool (*can_accept_capabilities)(const uint8_t *capabilities_buffer, uint8_t capabilities_size, bool for_encoding);
diff --git a/src/modules/bluetooth/a2dp-codec-aptx-gst.c b/src/modules/bluetooth/a2dp-codec-aptx-gst.c
index d0573e3b2..4b64c35b6 100644
--- a/src/modules/bluetooth/a2dp-codec-aptx-gst.c
+++ b/src/modules/bluetooth/a2dp-codec-aptx-gst.c
@@ -490,7 +490,11 @@ static size_t reduce_encoder_bitrate(void *codec_info, size_t write_link_mtu) {
 static size_t encode_buffer(void *codec_info, uint32_t timestamp, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed) {
     size_t written;
 
+<<<<<<< HEAD
+    written = gst_transcode_buffer(codec_info, input_buffer, input_size, output_buffer, output_size, processed);
+=======
     written = gst_transcode_buffer(codec_info, timestamp, input_buffer, input_size, output_buffer, output_size, processed);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (PA_UNLIKELY(*processed == 0 || *processed != input_size))
         pa_log_error("aptX encoding error");
 
@@ -526,7 +530,11 @@ static size_t encode_buffer_hd(void *codec_info, uint32_t timestamp, const uint8
 static size_t decode_buffer(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed) {
     size_t written;
 
+<<<<<<< HEAD
+    written = gst_transcode_buffer(codec_info, input_buffer, input_size, output_buffer, output_size, processed);
+=======
     written = gst_transcode_buffer(codec_info, -1, input_buffer, input_size, output_buffer, output_size, processed);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     /* Due to aptX latency, aptx_decode starts filling output buffer after 90 input samples.
      * If input buffer contains less than 90 samples, aptx_decode returns zero (=no output)
@@ -556,6 +564,10 @@ static size_t decode_buffer_hd(void *codec_info, const uint8_t *input_buffer, si
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_aptx = {
     .id = { A2DP_CODEC_VENDOR, APTX_VENDOR_ID, APTX_CODEC_ID },
+<<<<<<< HEAD
+    .support_backchannel = false,
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities,
     .choose_remote_endpoint = choose_remote_endpoint,
@@ -579,6 +591,10 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_aptx = {
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_aptx_hd = {
     .id = { A2DP_CODEC_VENDOR, APTX_HD_VENDOR_ID, APTX_HD_CODEC_ID },
+<<<<<<< HEAD
+    .support_backchannel = false,
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities_hd,
     .choose_remote_endpoint = choose_remote_endpoint_hd,
diff --git a/src/modules/bluetooth/a2dp-codec-gst.c b/src/modules/bluetooth/a2dp-codec-gst.c
index 11839c580..0e45957f3 100644
--- a/src/modules/bluetooth/a2dp-codec-gst.c
+++ b/src/modules/bluetooth/a2dp-codec-gst.c
@@ -22,14 +22,20 @@
 #endif
 
 #include <arpa/inet.h>
+<<<<<<< HEAD
+=======
 #include <stdint.h>
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/once.h>
 #include <pulsecore/core-util.h>
 #include <pulse/sample.h>
+<<<<<<< HEAD
+=======
 #include <pulse/timeval.h>
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #include <pulse/util.h>
 
 #include "a2dp-codecs.h"
@@ -41,6 +47,85 @@ static void app_sink_eos(GstAppSink *appsink, gpointer userdata) {
     pa_log_debug("Sink got EOS");
 }
 
+<<<<<<< HEAD
+/* Called from the GStreamer streaming thread */
+static GstFlowReturn app_sink_new_sample(GstAppSink *appsink, gpointer userdata) {
+    struct gst_info *info = (struct gst_info *) userdata;
+    GstSample *sample = NULL;
+    GstBuffer *buf;
+
+    sample = gst_app_sink_pull_sample(GST_APP_SINK(info->app_sink));
+    if (!sample)
+        return GST_FLOW_OK;
+
+    buf = gst_sample_get_buffer(sample);
+    gst_buffer_ref(buf);
+    gst_adapter_push(info->sink_adapter, buf);
+    gst_sample_unref(sample);
+    pa_fdsem_post(info->sample_ready_fdsem);
+
+    return GST_FLOW_OK;
+}
+
+static void gst_deinit_common(struct gst_info *info) {
+    if (!info)
+        return;
+    if (info->sample_ready_fdsem)
+        pa_fdsem_free(info->sample_ready_fdsem);
+    if (info->app_src)
+        gst_object_unref(info->app_src);
+    if (info->app_sink)
+        gst_object_unref(info->app_sink);
+    if (info->sink_adapter)
+        g_object_unref(info->sink_adapter);
+    if (info->pipeline)
+        gst_object_unref(info->pipeline);
+}
+
+static GstBusSyncReply sync_bus_handler (GstBus *bus, GstMessage *message, struct gst_info *info) {
+    GstStreamStatusType type;
+    GstElement *owner;
+
+    switch (GST_MESSAGE_TYPE (message)) {
+        case GST_MESSAGE_STREAM_STATUS:
+
+            gst_message_parse_stream_status (message, &type, &owner);
+
+            switch (type) {
+            case GST_STREAM_STATUS_TYPE_ENTER:
+                pa_log_debug("GStreamer pipeline thread starting up");
+                if (info->core->realtime_scheduling)
+                    pa_thread_make_realtime(info->core->realtime_priority);
+                break;
+            case GST_STREAM_STATUS_TYPE_LEAVE:
+                pa_log_debug("GStreamer pipeline thread shutting down");
+                break;
+            default:
+                break;
+            }
+        break;
+        default:
+            break;
+    }
+
+    /* pass all messages on the async queue */
+    return GST_BUS_PASS;
+}
+
+bool gst_init_common(struct gst_info *info) {
+    GstElement *pipeline = NULL;
+    GstElement *appsrc = NULL, *appsink = NULL;
+    GstAdapter *adapter;
+    GstAppSinkCallbacks callbacks = { 0, };
+    GstBus *bus;
+
+    appsrc = gst_element_factory_make("appsrc", "app_source");
+    if (!appsrc) {
+        pa_log_error("Could not create appsrc element");
+        goto fail;
+    }
+    g_object_set(appsrc, "is-live", FALSE, "format", GST_FORMAT_TIME, "stream-type", 0, "max-bytes", 0, NULL);
+=======
 static void gst_deinit_common(struct gst_info *info) {
     if (!info)
         return;
@@ -54,6 +139,7 @@ bool gst_init_common(struct gst_info *info) {
     GstElement *bin = NULL;
     GstElement *appsink = NULL;
     GstAppSinkCallbacks callbacks = { 0, };
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     appsink = gst_element_factory_make("appsink", "app_sink");
     if (!appsink) {
@@ -63,6 +149,26 @@ bool gst_init_common(struct gst_info *info) {
     g_object_set(appsink, "sync", FALSE, "async", FALSE, "enable-last-sample", FALSE, NULL);
 
     callbacks.eos = app_sink_eos;
+<<<<<<< HEAD
+    callbacks.new_sample = app_sink_new_sample;
+    gst_app_sink_set_callbacks(GST_APP_SINK(appsink), &callbacks, info, NULL);
+
+    adapter = gst_adapter_new();
+    pa_assert(adapter);
+
+    pipeline = gst_pipeline_new(NULL);
+    pa_assert(pipeline);
+
+    bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
+    gst_bus_set_sync_handler (bus, (GstBusSyncHandler) sync_bus_handler, info, NULL);
+    gst_object_unref (bus);
+
+    info->app_src = appsrc;
+    info->app_sink = appsink;
+    info->sink_adapter = adapter;
+    info->pipeline = pipeline;
+    info->sample_ready_fdsem = pa_fdsem_new();
+=======
     gst_app_sink_set_callbacks(GST_APP_SINK(appsink), &callbacks, info, NULL);
 
     bin = gst_bin_new(NULL);
@@ -70,20 +176,68 @@ bool gst_init_common(struct gst_info *info) {
 
     info->app_sink = appsink;
     info->bin = bin;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     return true;
 
 fail:
+<<<<<<< HEAD
+    if (appsrc)
+        gst_object_unref(appsrc);
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (appsink)
         gst_object_unref(appsink);
 
     return false;
 }
 
+<<<<<<< HEAD
+/*
+ * The idea of using buffer probes is as follows. We set a buffer probe on the
+ * encoder sink pad. In the buffer probe, we set an idle probe on the upstream
+ * source pad. In encode_buffer, we wait on the fdsem. The fdsem gets posted
+ * when either new_sample or idle probe gets called. We do this, to make the
+ * appsink behave synchronously.
+ *
+ * For buffer probes, see
+ * https://gstreamer.freedesktop.org/documentation/additional/design/probes.html?gi-language=c
+ */
+static GstPadProbeReturn gst_sink_buffer_idle_probe(GstPad *pad, GstPadProbeInfo *probe_info, gpointer userdata)
+{
+    struct gst_info *info = (struct gst_info *)userdata;
+
+    pa_assert(probe_info->type & GST_PAD_PROBE_TYPE_IDLE);
+
+    pa_fdsem_post(info->sample_ready_fdsem);
+
+    return GST_PAD_PROBE_REMOVE;
+}
+
+static GstPadProbeReturn gst_sink_buffer_probe(GstPad *pad, GstPadProbeInfo *probe_info, gpointer userdata)
+{
+    struct gst_info *info = (struct gst_info *)userdata;
+    GstPad *peer_pad;
+
+    pa_assert(probe_info->type & GST_PAD_PROBE_TYPE_BUFFER);
+
+    peer_pad = gst_pad_get_peer(pad);
+    gst_pad_add_probe(peer_pad, GST_PAD_PROBE_TYPE_IDLE, gst_sink_buffer_idle_probe, info, NULL);
+    gst_object_unref(peer_pad);
+
+    return GST_PAD_PROBE_OK;
+}
+
+static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) {
+    gchar *sample_format;
+    GstCaps *caps;
+    int channel_mask;
+=======
 static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) {
     gchar *sample_format;
     GstCaps *caps;
     uint64_t channel_mask;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     switch (ss->format) {
         case PA_SAMPLE_S16LE:
@@ -130,10 +284,13 @@ static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) {
 bool gst_codec_init(struct gst_info *info, bool for_encoding, GstElement *transcoder) {
     GstPad *pad;
     GstCaps *caps;
+<<<<<<< HEAD
+=======
     GstEvent *event;
     GstSegment segment;
     GstEvent *stream_start;
     guint group_id;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_assert(transcoder);
 
@@ -142,13 +299,30 @@ bool gst_codec_init(struct gst_info *info, bool for_encoding, GstElement *transc
     if (!gst_init_common(info))
         goto common_fail;
 
+<<<<<<< HEAD
+    caps = gst_create_caps_from_sample_spec(info->ss);
+    if (for_encoding)
+        g_object_set(info->app_src, "caps", caps, NULL);
+    else
+        g_object_set(info->app_sink, "caps", caps, NULL);
+    gst_caps_unref(caps);
+
+
+    gst_bin_add_many(GST_BIN(info->pipeline), info->app_src, transcoder, info->app_sink, NULL);
+
+    if (!gst_element_link_many(info->app_src, transcoder, info->app_sink, NULL)) {
+=======
     gst_bin_add_many(GST_BIN(info->bin), transcoder, info->app_sink, NULL);
 
     if (!gst_element_link_many(transcoder, info->app_sink, NULL)) {
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         pa_log_error("Failed to link codec elements into pipeline");
         goto pipeline_fail;
     }
 
+<<<<<<< HEAD
+    if (gst_element_set_state(info->pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
+=======
     pad = gst_element_get_static_pad(transcoder, "sink");
     pa_assert_se(gst_element_add_pad(info->bin, gst_ghost_pad_new("sink", pad)));
     /**
@@ -159,10 +333,17 @@ bool gst_codec_init(struct gst_info *info, bool for_encoding, GstElement *transc
     info->pad_sink = pad;
 
     if (gst_element_set_state(info->bin, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         pa_log_error("Could not start pipeline");
         goto pipeline_fail;
     }
 
+<<<<<<< HEAD
+    /* See the comment on buffer probe functions */
+    pad = gst_element_get_static_pad(transcoder, "sink");
+    gst_pad_add_probe(pad, GST_PAD_PROBE_TYPE_BUFFER, gst_sink_buffer_probe, info, NULL);
+    gst_object_unref(pad);
+=======
     /* First, send stream-start sticky event */
     group_id = gst_util_group_id_next();
     stream_start = gst_event_new_stream_start("gst-codec-pa");
@@ -185,6 +366,7 @@ bool gst_codec_init(struct gst_info *info, bool for_encoding, GstElement *transc
     gst_segment_init(&segment, GST_FORMAT_TIME);
     event = gst_event_new_segment(&segment);
     gst_pad_send_event(info->pad_sink, event);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_log_info("GStreamer pipeline initialisation succeeded");
 
@@ -208,6 +390,24 @@ common_fail:
     return false;
 }
 
+<<<<<<< HEAD
+size_t gst_transcode_buffer(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed) {
+    struct gst_info *info = (struct gst_info *) codec_info;
+    gsize available, transcoded;
+    GstBuffer *in_buf;
+    GstMapInfo map_info;
+    GstFlowReturn ret;
+    size_t written = 0;
+
+    in_buf = gst_buffer_new_allocate(NULL, input_size, NULL);
+    pa_assert(in_buf);
+
+    pa_assert_se(gst_buffer_map(in_buf, &map_info, GST_MAP_WRITE));
+    memcpy(map_info.data, input_buffer, input_size);
+    gst_buffer_unmap(in_buf, &map_info);
+
+    ret = gst_app_src_push_buffer(GST_APP_SRC(info->app_src), in_buf);
+=======
 size_t gst_transcode_buffer(void *codec_info, uint32_t timestamp, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed) {
     struct gst_info *info = (struct gst_info *) codec_info;
     gsize transcoded;
@@ -242,11 +442,27 @@ size_t gst_transcode_buffer(void *codec_info, uint32_t timestamp, const uint8_t
     pa_assert(GST_MINI_OBJECT_REFCOUNT_VALUE(in_buf) == 1);
     gst_mini_object_unref(GST_MINI_OBJECT_CAST(in_buf));
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (ret != GST_FLOW_OK) {
         pa_log_error("failed to push buffer for transcoding %d", ret);
         goto fail;
     }
 
+<<<<<<< HEAD
+    pa_fdsem_wait(info->sample_ready_fdsem);
+
+    available = gst_adapter_available(info->sink_adapter);
+
+    if (available) {
+        transcoded = PA_MIN(available, output_size);
+
+        gst_adapter_copy(info->sink_adapter, output_buffer, 0, transcoded);
+        gst_adapter_flush(info->sink_adapter, transcoded);
+
+        written += transcoded;
+    } else
+        pa_log_debug("No transcoded data available in adapter");
+=======
     while ((sample = gst_app_sink_try_pull_sample(GST_APP_SINK(info->app_sink), 0))) {
         in_buf = gst_sample_get_buffer(sample);
 
@@ -260,6 +476,7 @@ size_t gst_transcode_buffer(void *codec_info, uint32_t timestamp, const uint8_t
         gst_buffer_unmap(in_buf, &map_info);
         gst_sample_unref(sample);
     }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     *processed = input_size;
 
@@ -274,6 +491,19 @@ fail:
 void gst_codec_deinit(void *codec_info) {
     struct gst_info *info = (struct gst_info *) codec_info;
 
+<<<<<<< HEAD
+    if (info->sample_ready_fdsem)
+        pa_fdsem_free(info->sample_ready_fdsem);
+
+
+    if (info->pipeline) {
+        gst_element_set_state(info->pipeline, GST_STATE_NULL);
+        gst_object_unref(info->pipeline);
+    }
+
+    if (info->sink_adapter)
+        g_object_unref(info->sink_adapter);
+=======
     if (info->bin) {
         gst_element_set_state(info->bin, GST_STATE_NULL);
         gst_object_unref(info->bin);
@@ -281,6 +511,7 @@ void gst_codec_deinit(void *codec_info) {
 
     if (info->pad_sink)
         gst_object_unref(GST_OBJECT(info->pad_sink));
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_xfree(info);
 }
diff --git a/src/modules/bluetooth/a2dp-codec-gst.h b/src/modules/bluetooth/a2dp-codec-gst.h
index 6e490aa11..eed741f52 100644
--- a/src/modules/bluetooth/a2dp-codec-gst.h
+++ b/src/modules/bluetooth/a2dp-codec-gst.h
@@ -43,15 +43,27 @@ struct gst_info {
         const a2dp_ldac_t *ldac_config;
     } a2dp_codec_t;
 
+<<<<<<< HEAD
+    GstElement *app_src, *app_sink;
+    GstElement *pipeline;
+    GstAdapter *sink_adapter;
+
+    pa_fdsem *sample_ready_fdsem;
+=======
     /* The appsink element that accumulates encoded/decoded buffers */
     GstElement *app_sink;
     GstElement *bin;
     /* The sink pad to push to-be-encoded/decoded buffers into */
     GstPad *pad_sink;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     uint16_t seq_num;
 };
 
 bool gst_codec_init(struct gst_info *info, bool for_encoding, GstElement *transcoder);
+<<<<<<< HEAD
+size_t gst_transcode_buffer(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed);
+=======
 size_t gst_transcode_buffer(void *codec_info, uint32_t timestamp, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 void gst_codec_deinit(void *codec_info);
diff --git a/src/modules/bluetooth/a2dp-codec-ldac-gst.c b/src/modules/bluetooth/a2dp-codec-ldac-gst.c
index dfefbf186..dabe3d720 100644
--- a/src/modules/bluetooth/a2dp-codec-ldac-gst.c
+++ b/src/modules/bluetooth/a2dp-codec-ldac-gst.c
@@ -46,6 +46,16 @@ static bool can_be_supported(bool for_encoding) {
     }
     gst_object_unref(element_factory);
 
+<<<<<<< HEAD
+    element_factory = gst_element_factory_find("rtpldacpay");
+    if (element_factory == NULL) {
+        pa_log_info("LDAC RTP payloader element `rtpldacpay` not found");
+        return false;
+    }
+    gst_object_unref(element_factory);
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     return true;
 }
 
@@ -199,6 +209,10 @@ static uint8_t fill_preferred_configuration(const pa_sample_spec *default_sample
 
 GstElement *gst_init_ldac(struct gst_info *info, pa_sample_spec *ss, bool for_encoding) {
     GstElement *bin;
+<<<<<<< HEAD
+    GstElement *rtpldacpay;
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     GstElement *enc;
     GstPad *pad;
 
@@ -262,16 +276,39 @@ GstElement *gst_init_ldac(struct gst_info *info, pa_sample_spec *ss, bool for_en
             goto fail;
     }
 
+<<<<<<< HEAD
+    rtpldacpay = gst_element_factory_make("rtpldacpay", "rtp_ldac_pay");
+    if (!rtpldacpay) {
+        pa_log_error("Could not create RTP LDAC payloader element");
+        goto fail;
+    }
+
+    bin = gst_bin_new("ldac_enc_bin");
+    pa_assert(bin);
+
+    gst_bin_add_many(GST_BIN(bin), enc, rtpldacpay, NULL);
+
+    if (!gst_element_link(enc, rtpldacpay)) {
+        pa_log_error("Failed to link LDAC encoder to LDAC RTP payloader");
+        gst_object_unref(bin);
+        return NULL;
+    }
+=======
     bin = gst_bin_new("ldac_enc_bin");
     pa_assert(bin);
 
     gst_bin_add_many(GST_BIN(bin), enc, NULL);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pad = gst_element_get_static_pad(enc, "sink");
     pa_assert_se(gst_element_add_pad(bin, gst_ghost_pad_new("sink", pad)));
     gst_object_unref(GST_OBJECT(pad));
 
+<<<<<<< HEAD
+    pad = gst_element_get_static_pad(rtpldacpay, "src");
+=======
     pad = gst_element_get_static_pad(enc, "src");
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     pa_assert_se(gst_element_add_pad(bin, gst_ghost_pad_new("src", pad)));
     gst_object_unref(GST_OBJECT(pad));
 
@@ -401,6 +438,14 @@ static size_t reduce_encoder_bitrate(void *codec_info, size_t write_link_mtu) {
 }
 
 static size_t encode_buffer(void *codec_info, uint32_t timestamp, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed) {
+<<<<<<< HEAD
+    size_t written;
+
+    written = gst_transcode_buffer(codec_info, input_buffer, input_size, output_buffer, output_size, processed);
+    if (PA_UNLIKELY(*processed != input_size))
+        pa_log_error("LDAC encoding error");
+
+=======
     struct gst_info *info = (struct gst_info *) codec_info;
     struct rtp_header *header;
     struct rtp_payload *payload;
@@ -428,11 +473,16 @@ static size_t encode_buffer(void *codec_info, uint32_t timestamp, const uint8_t
         written += sizeof(*header) + sizeof(*payload);
     }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     return written;
 }
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_hq = {
     .id = { A2DP_CODEC_VENDOR, LDAC_VENDOR_ID, LDAC_CODEC_ID },
+<<<<<<< HEAD
+    .support_backchannel = false,
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities,
     .choose_remote_endpoint = choose_remote_endpoint,
@@ -455,6 +505,10 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_hq = {
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_sq = {
     .id = { A2DP_CODEC_VENDOR, LDAC_VENDOR_ID, LDAC_CODEC_ID },
+<<<<<<< HEAD
+    .support_backchannel = false,
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities,
     .choose_remote_endpoint = choose_remote_endpoint,
@@ -477,6 +531,10 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_sq = {
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_mq = {
     .id = { A2DP_CODEC_VENDOR, LDAC_VENDOR_ID, LDAC_CODEC_ID },
+<<<<<<< HEAD
+    .support_backchannel = false,
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities,
     .choose_remote_endpoint = choose_remote_endpoint,
diff --git a/src/modules/bluetooth/a2dp-codec-sbc.c b/src/modules/bluetooth/a2dp-codec-sbc.c
index 1306c79f2..d8e18dbdd 100644
--- a/src/modules/bluetooth/a2dp-codec-sbc.c
+++ b/src/modules/bluetooth/a2dp-codec-sbc.c
@@ -38,8 +38,11 @@
 
 #define SBC_BITPOOL_DEC_STEP 5
 #define SBC_BITPOOL_INC_STEP 1
+<<<<<<< HEAD
+=======
 
 #define SBC_SYNCWORD    0x9C
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 struct sbc_info {
     sbc_t sbc;                           /* Codec data */
@@ -56,12 +59,15 @@ struct sbc_info {
 
     uint8_t nr_blocks;
     uint8_t nr_subbands;
+<<<<<<< HEAD
+=======
 
     bool boost_source_volume;
     /* Size of SBC frame fragment left over from previous decoding iteration */
     size_t frame_fragment_size;
     /* Maximum SBC frame size is 512 bytes when SBC compression ratio > 1 */
     uint8_t frame_fragment[512];
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 };
 
 static bool can_be_supported(bool for_encoding) {
@@ -116,6 +122,8 @@ static bool can_accept_capabilities_xq(const uint8_t *capabilities_buffer, uint8
     return true;
 }
 
+<<<<<<< HEAD
+=======
 static bool can_accept_capabilities_faststream(const uint8_t *capabilities_buffer, uint8_t capabilities_size, bool for_encoding) {
     const a2dp_faststream_t *capabilities = (const a2dp_faststream_t *) capabilities_buffer;
 
@@ -134,6 +142,7 @@ static bool can_accept_capabilities_faststream(const uint8_t *capabilities_buffe
     return true;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static const char *choose_remote_endpoint(const pa_hashmap *capabilities_hashmap, const pa_sample_spec *default_sample_spec, bool for_encoding) {
     const pa_a2dp_codec_capabilities *a2dp_capabilities;
     const char *key;
@@ -162,6 +171,8 @@ static const char *choose_remote_endpoint_xq(const pa_hashmap *capabilities_hash
     return NULL;
 }
 
+<<<<<<< HEAD
+=======
 static const char *choose_remote_endpoint_faststream(const pa_hashmap *capabilities_hashmap, const pa_sample_spec *default_sample_spec, bool for_encoding) {
     const pa_a2dp_codec_capabilities *a2dp_capabilities;
     const char *key;
@@ -179,6 +190,7 @@ static const char *choose_remote_endpoint_faststream(const pa_hashmap *capabilit
     return NULL;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static uint8_t fill_capabilities(uint8_t capabilities_buffer[MAX_A2DP_CAPS_SIZE]) {
     a2dp_sbc_t *capabilities = (a2dp_sbc_t *) capabilities_buffer;
 
@@ -197,6 +209,8 @@ static uint8_t fill_capabilities(uint8_t capabilities_buffer[MAX_A2DP_CAPS_SIZE]
     return sizeof(*capabilities);
 }
 
+<<<<<<< HEAD
+=======
 static void set_info_and_sample_spec_from_sbc_config(struct sbc_info *sbc_info, pa_sample_spec *sample_spec, const a2dp_sbc_t *config) {
     switch (config->frequency) {
         case SBC_SAMPLING_FREQ_16000:
@@ -338,6 +352,7 @@ static uint8_t sbc_get_max_bitpool_below_rate(a2dp_sbc_t *config, uint8_t lower_
     return lower_bound;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 /* SBC XQ
  *
  * References:
@@ -345,19 +360,31 @@ static uint8_t sbc_get_max_bitpool_below_rate(a2dp_sbc_t *config, uint8_t lower_
  *   http://soundexpert.org/articles/-/blogs/audio-quality-of-sbc-xq-bluetooth-audio-codec
  *
  */
+<<<<<<< HEAD
+static uint8_t fill_capabilities_xq(uint8_t capabilities_buffer[MAX_A2DP_CAPS_SIZE]) {
+=======
 static uint8_t fill_capabilities_xq(uint8_t capabilities_buffer[MAX_A2DP_CAPS_SIZE], uint32_t bitrate_cap) {
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     a2dp_sbc_t *capabilities = (a2dp_sbc_t *) capabilities_buffer;
 
     pa_zero(*capabilities);
 
+<<<<<<< HEAD
+    capabilities->channel_mode = SBC_CHANNEL_MODE_DUAL_CHANNEL;
+    capabilities->frequency = SBC_SAMPLING_FREQ_44100 | SBC_SAMPLING_FREQ_48000;
+=======
     /* Bitpool value increases with sample rate. Prepare to calculate maximum viable
      * bitpool value at specified bitrate_cap, with rest of SBC parameters fixed. */
     capabilities->channel_mode = SBC_CHANNEL_MODE_DUAL_CHANNEL;
     capabilities->frequency = SBC_SAMPLING_FREQ_48000;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     capabilities->allocation_method = SBC_ALLOCATION_LOUDNESS;
     capabilities->subbands = SBC_SUBBANDS_8;
     capabilities->block_length = SBC_BLOCK_LENGTH_16;
     capabilities->min_bitpool = SBC_MIN_BITPOOL;
+<<<<<<< HEAD
+    capabilities->max_bitpool = SBC_MAX_BITPOOL;
+=======
     capabilities->max_bitpool = SBC_MAX_BITPOOL; /* Upper boundary in calculation below. */
 
     /* Now calculate and write it back to be exposed through endpoint capabilities. */
@@ -379,10 +406,13 @@ static uint8_t fill_capabilities_faststream(uint8_t capabilities_buffer[MAX_A2DP
     capabilities->direction = FASTSTREAM_DIRECTION_SINK | FASTSTREAM_DIRECTION_SOURCE;
     capabilities->sink_frequency = FASTSTREAM_SINK_SAMPLING_FREQ_44100 | FASTSTREAM_SINK_SAMPLING_FREQ_48000;
     capabilities->source_frequency = FASTSTREAM_SOURCE_SAMPLING_FREQ_16000;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     return sizeof(*capabilities);
 }
 
+<<<<<<< HEAD
+=======
 static bool is_configuration_valid_faststream(const uint8_t *config_buffer, uint8_t config_size) {
     const a2dp_faststream_t *config = (const a2dp_faststream_t *) config_buffer;
 
@@ -409,6 +439,7 @@ static bool is_configuration_valid_faststream(const uint8_t *config_buffer, uint
     return true;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static bool is_configuration_valid(const uint8_t *config_buffer, uint8_t config_size) {
     const a2dp_sbc_t *config = (const a2dp_sbc_t *) config_buffer;
 
@@ -610,6 +641,13 @@ static uint8_t fill_preferred_configuration(const pa_sample_spec *default_sample
     return sizeof(*config);
 }
 
+<<<<<<< HEAD
+static void set_info_and_sample_spec_from_sbc_config(struct sbc_info *sbc_info, pa_sample_spec *sample_spec, const a2dp_sbc_t *config) {
+    switch (config->frequency) {
+        case SBC_SAMPLING_FREQ_16000:
+            sbc_info->frequency = SBC_FREQ_16000;
+            sample_spec->rate = 16000U;
+=======
 static uint8_t fill_preferred_configuration_faststream(const pa_sample_spec *default_sample_spec, const uint8_t *capabilities_buffer, uint8_t capabilities_size, uint8_t config_buffer[MAX_A2DP_CAPS_SIZE]) {
     a2dp_faststream_t *config = (a2dp_faststream_t *) config_buffer;
     const a2dp_faststream_t *capabilities = (const a2dp_faststream_t *) capabilities_buffer;
@@ -641,6 +679,7 @@ static uint8_t fill_preferred_configuration_faststream(const pa_sample_spec *def
     for (i = 0; (unsigned) i < PA_ELEMENTSOF(sink_freq_table); i++)
         if (sink_freq_table[i].rate >= default_sample_spec->rate && (capabilities->sink_frequency & sink_freq_table[i].cap)) {
             config->sink_frequency = sink_freq_table[i].cap;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             break;
         }
 
@@ -689,6 +728,135 @@ static uint8_t fill_preferred_configuration_faststream(const pa_sample_spec *def
     return sizeof(*config);
 }
 
+static uint8_t fill_preferred_configuration_xq(const pa_sample_spec *default_sample_spec, const uint8_t *capabilities_buffer, uint8_t capabilities_size, uint8_t config_buffer[MAX_A2DP_CAPS_SIZE], uint32_t bitrate_cap) {
+    a2dp_sbc_t *config = (a2dp_sbc_t *) config_buffer;
+    const a2dp_sbc_t *capabilities = (const a2dp_sbc_t *) capabilities_buffer;
+    int i;
+
+    static const struct {
+        uint32_t rate;
+        uint8_t cap;
+    } freq_table[] = {
+        { 16000U, SBC_SAMPLING_FREQ_16000 },
+        { 32000U, SBC_SAMPLING_FREQ_32000 },
+        { 44100U, SBC_SAMPLING_FREQ_44100 },
+        { 48000U, SBC_SAMPLING_FREQ_48000 }
+    };
+
+    if (capabilities_size != sizeof(*capabilities)) {
+        pa_log_error("Invalid size of capabilities buffer");
+        return 0;
+    }
+
+<<<<<<< HEAD
+    switch (config->subbands) {
+        case SBC_SUBBANDS_4:
+            sbc_info->subbands = SBC_SB_4;
+            sbc_info->nr_subbands = 4;
+            break;
+        case SBC_SUBBANDS_8:
+            sbc_info->subbands = SBC_SB_8;
+            sbc_info->nr_subbands = 8;
+=======
+    pa_zero(*config);
+
+    /* Find the lowest freq that is at least as high as the requested sampling rate */
+    for (i = 0; (unsigned) i < PA_ELEMENTSOF(freq_table); i++)
+        if (freq_table[i].rate >= default_sample_spec->rate && (capabilities->frequency & freq_table[i].cap)) {
+            config->frequency = freq_table[i].cap;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+            break;
+        }
+
+    if ((unsigned) i == PA_ELEMENTSOF(freq_table)) {
+        for (--i; i >= 0; i--) {
+            if (capabilities->frequency & freq_table[i].cap) {
+                config->frequency = freq_table[i].cap;
+                break;
+            }
+        }
+
+        if (i < 0) {
+            pa_log_error("Not suitable sample rate");
+            return 0;
+        }
+    }
+
+<<<<<<< HEAD
+    switch (config->block_length) {
+        case SBC_BLOCK_LENGTH_4:
+            sbc_info->blocks = SBC_BLK_4;
+            sbc_info->nr_blocks = 4;
+            break;
+        case SBC_BLOCK_LENGTH_8:
+            sbc_info->blocks = SBC_BLK_8;
+            sbc_info->nr_blocks = 8;
+            break;
+        case SBC_BLOCK_LENGTH_12:
+            sbc_info->blocks = SBC_BLK_12;
+            sbc_info->nr_blocks = 12;
+            break;
+        case SBC_BLOCK_LENGTH_16:
+            sbc_info->blocks = SBC_BLK_16;
+            sbc_info->nr_blocks = 16;
+            break;
+        default:
+            pa_assert_not_reached();
+    }
+
+    sbc_info->min_bitpool = config->min_bitpool;
+    sbc_info->max_bitpool = config->max_bitpool;
+}
+
+static void set_params(struct sbc_info *sbc_info) {
+    sbc_info->sbc.frequency = sbc_info->frequency;
+    sbc_info->sbc.blocks = sbc_info->blocks;
+    sbc_info->sbc.subbands = sbc_info->subbands;
+    sbc_info->sbc.mode = sbc_info->mode;
+    sbc_info->sbc.allocation = sbc_info->allocation;
+    sbc_info->sbc.bitpool = sbc_info->initial_bitpool;
+    sbc_info->sbc.endian = SBC_LE;
+
+    sbc_info->codesize = sbc_get_codesize(&sbc_info->sbc);
+    sbc_info->frame_length = sbc_get_frame_length(&sbc_info->sbc);
+}
+
+uint8_t sbc_get_max_bitpool_below_rate(a2dp_sbc_t *config, uint8_t lower_bound, uint8_t upper_bound, uint32_t bitrate_cap) {
+    pa_sample_spec sample_spec;
+    struct sbc_info sbc_info;
+    int ret;
+
+    pa_assert(config);
+
+    ret = sbc_init(&sbc_info.sbc, 0);
+    if (ret != 0) {
+        pa_log_error("SBC initialization failed: %d", ret);
+        return lower_bound;
+    }
+
+    set_info_and_sample_spec_from_sbc_config(&sbc_info, &sample_spec, config);
+
+    while (upper_bound - lower_bound > 1) {
+        size_t midpoint = (upper_bound + lower_bound) / 2;
+
+        sbc_info.initial_bitpool = midpoint;
+        set_params(&sbc_info);
+
+        size_t bitrate = sbc_info.frame_length * 8 * sample_spec.rate / (sbc_info.nr_subbands * sbc_info.nr_blocks);
+
+        if (bitrate > bitrate_cap)
+            upper_bound = midpoint;
+        else
+            lower_bound = midpoint;
+    }
+
+    sbc_finish(&sbc_info.sbc);
+
+    pa_log_debug("SBC target bitrate %u bitpool %u sample rate %u", bitrate_cap, lower_bound, sample_spec.rate);
+
+    return lower_bound;
+}
+
 static uint8_t fill_preferred_configuration_xq(const pa_sample_spec *default_sample_spec, const uint8_t *capabilities_buffer, uint8_t capabilities_size, uint8_t config_buffer[MAX_A2DP_CAPS_SIZE], uint32_t bitrate_cap) {
     a2dp_sbc_t *config = (a2dp_sbc_t *) config_buffer;
     const a2dp_sbc_t *capabilities = (const a2dp_sbc_t *) capabilities_buffer;
@@ -750,6 +918,26 @@ static uint8_t fill_preferred_configuration_xq(const pa_sample_spec *default_sam
         }
     }
 
+=======
+    pa_assert((unsigned) i < PA_ELEMENTSOF(freq_table));
+
+    if (default_sample_spec->channels <= 1) {
+        if (capabilities->channel_mode & SBC_CHANNEL_MODE_DUAL_CHANNEL)
+            config->channel_mode = SBC_CHANNEL_MODE_DUAL_CHANNEL;
+        else {
+            pa_log_error("No supported channel modes");
+            return 0;
+        }
+    } else {
+        if (capabilities->channel_mode & SBC_CHANNEL_MODE_DUAL_CHANNEL)
+            config->channel_mode = SBC_CHANNEL_MODE_DUAL_CHANNEL;
+        else {
+            pa_log_error("No supported channel modes");
+            return 0;
+        }
+    }
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (capabilities->block_length & SBC_BLOCK_LENGTH_16)
         config->block_length = SBC_BLOCK_LENGTH_16;
     else {
@@ -782,26 +970,35 @@ static uint8_t fill_preferred_configuration_xq(const pa_sample_spec *default_sam
     return sizeof(*config);
 }
 
+<<<<<<< HEAD
+=======
 static uint8_t fill_capabilities_xq_453kbps(uint8_t capabilities_buffer[MAX_A2DP_CAPS_SIZE]) {
     return fill_capabilities_xq(capabilities_buffer, 453000);
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static uint8_t fill_preferred_configuration_xq_453kbps(const pa_sample_spec *default_sample_spec, const uint8_t *capabilities_buffer, uint8_t capabilities_size, uint8_t config_buffer[MAX_A2DP_CAPS_SIZE]) {
     return fill_preferred_configuration_xq(default_sample_spec, capabilities_buffer, capabilities_size, config_buffer, 453000);
 }
 
+<<<<<<< HEAD
+=======
 static uint8_t fill_capabilities_xq_512kbps(uint8_t capabilities_buffer[MAX_A2DP_CAPS_SIZE]) {
     return fill_capabilities_xq(capabilities_buffer, 512000);
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static uint8_t fill_preferred_configuration_xq_512kbps(const pa_sample_spec *default_sample_spec, const uint8_t *capabilities_buffer, uint8_t capabilities_size, uint8_t config_buffer[MAX_A2DP_CAPS_SIZE]) {
     return fill_preferred_configuration_xq(default_sample_spec, capabilities_buffer, capabilities_size, config_buffer, 512000);
 }
 
+<<<<<<< HEAD
+=======
 static uint8_t fill_capabilities_xq_552kbps(uint8_t capabilities_buffer[MAX_A2DP_CAPS_SIZE]) {
     return fill_capabilities_xq(capabilities_buffer, 552000);
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static uint8_t fill_preferred_configuration_xq_552kbps(const pa_sample_spec *default_sample_spec, const uint8_t *capabilities_buffer, uint8_t capabilities_size, uint8_t config_buffer[MAX_A2DP_CAPS_SIZE]) {
     return fill_preferred_configuration_xq(default_sample_spec, capabilities_buffer, capabilities_size, config_buffer, 552000);
 }
@@ -1002,6 +1199,11 @@ static size_t get_block_size(void *codec_info, size_t link_mtu) {
     return frame_count * sbc_info->codesize;
 }
 
+<<<<<<< HEAD
+static size_t get_encoded_block_size(void *codec_info, size_t input_size) {
+    struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
+    size_t rtp_size = sizeof(struct rtp_header) + sizeof(struct rtp_sbc_payload);
+=======
 static size_t get_write_block_size_faststream(void *codec_info, size_t link_mtu) {
     struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
     size_t frame_count = link_mtu / sbc_info->frame_length;
@@ -1027,6 +1229,7 @@ static size_t get_read_block_size_faststream(void *codec_info, size_t link_mtu)
 static size_t get_encoded_block_size(void *codec_info, size_t input_size) {
     struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
     size_t rtp_size = sizeof(struct rtp_header) + sizeof(struct rtp_payload);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     /* input size should be aligned to codec input block size */
     pa_assert_fp(input_size % sbc_info->codesize == 0);
@@ -1034,6 +1237,8 @@ static size_t get_encoded_block_size(void *codec_info, size_t input_size) {
     return (input_size / sbc_info->codesize) * sbc_info->frame_length + rtp_size;
 }
 
+<<<<<<< HEAD
+=======
 static size_t get_encoded_block_size_faststream(void *codec_info, size_t input_size) {
     struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
 
@@ -1043,6 +1248,7 @@ static size_t get_encoded_block_size_faststream(void *codec_info, size_t input_s
     return (input_size / sbc_info->codesize) * sbc_info->frame_length;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static size_t reduce_encoder_bitrate(void *codec_info, size_t write_link_mtu) {
     struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
     uint8_t bitpool;
@@ -1055,11 +1261,19 @@ static size_t reduce_encoder_bitrate(void *codec_info, size_t write_link_mtu) {
     set_bitpool(sbc_info, bitpool);
     return get_block_size(codec_info, write_link_mtu);
 }
+<<<<<<< HEAD
 
 static size_t increase_encoder_bitrate(void *codec_info, size_t write_link_mtu) {
     struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
     uint8_t bitpool;
 
+=======
+
+static size_t increase_encoder_bitrate(void *codec_info, size_t write_link_mtu) {
+    struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
+    uint8_t bitpool;
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     bitpool = PA_MIN(sbc_info->sbc.bitpool + SBC_BITPOOL_INC_STEP, sbc_info->max_bitpool);
 
     if (sbc_info->sbc.bitpool == bitpool)
@@ -1281,6 +1495,11 @@ static size_t decode_buffer(void *codec_info, const uint8_t *input_buffer, size_
     return d - output_buffer;
 }
 
+<<<<<<< HEAD
+const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc = {
+    .id = { A2DP_CODEC_SBC, 0, 0 },
+    .support_backchannel = false,
+=======
 static size_t decode_buffer_faststream(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed) {
     struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
 
@@ -1421,6 +1640,7 @@ double get_source_output_volume_factor_dB_faststream(void *codec_info) {
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc = {
     .id = { A2DP_CODEC_SBC, 0, 0 },
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities,
     .choose_remote_endpoint = choose_remote_endpoint,
@@ -1458,10 +1678,18 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc = {
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc_xq_453 = {
     .id = { A2DP_CODEC_SBC, 0, 0 },
+<<<<<<< HEAD
+    .support_backchannel = false,
+    .can_be_supported = can_be_supported,
+    .can_accept_capabilities = can_accept_capabilities_xq,
+    .choose_remote_endpoint = choose_remote_endpoint_xq,
+    .fill_capabilities = fill_capabilities_xq,
+=======
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities_xq,
     .choose_remote_endpoint = choose_remote_endpoint_xq,
     .fill_capabilities = fill_capabilities_xq_453kbps,
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .is_configuration_valid = is_configuration_valid,
     .fill_preferred_configuration = fill_preferred_configuration_xq_453kbps,
     .bt_codec = {
@@ -1482,10 +1710,18 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc_xq_453 = {
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc_xq_512 = {
     .id = { A2DP_CODEC_SBC, 0, 0 },
+<<<<<<< HEAD
+    .support_backchannel = false,
+    .can_be_supported = can_be_supported,
+    .can_accept_capabilities = can_accept_capabilities_xq,
+    .choose_remote_endpoint = choose_remote_endpoint_xq,
+    .fill_capabilities = fill_capabilities_xq,
+=======
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities_xq,
     .choose_remote_endpoint = choose_remote_endpoint_xq,
     .fill_capabilities = fill_capabilities_xq_512kbps,
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .is_configuration_valid = is_configuration_valid,
     .fill_preferred_configuration = fill_preferred_configuration_xq_512kbps,
     .bt_codec = {
@@ -1506,10 +1742,18 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc_xq_512 = {
 
 const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc_xq_552 = {
     .id = { A2DP_CODEC_SBC, 0, 0 },
+<<<<<<< HEAD
+    .support_backchannel = false,
+    .can_be_supported = can_be_supported,
+    .can_accept_capabilities = can_accept_capabilities_xq,
+    .choose_remote_endpoint = choose_remote_endpoint_xq,
+    .fill_capabilities = fill_capabilities_xq,
+=======
     .can_be_supported = can_be_supported,
     .can_accept_capabilities = can_accept_capabilities_xq,
     .choose_remote_endpoint = choose_remote_endpoint_xq,
     .fill_capabilities = fill_capabilities_xq_552kbps,
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     .is_configuration_valid = is_configuration_valid,
     .fill_preferred_configuration = fill_preferred_configuration_xq_552kbps,
     .bt_codec = {
@@ -1526,6 +1770,8 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_sbc_xq_552 = {
         .encode_buffer = encode_buffer,
         .decode_buffer = decode_buffer,
     },
+<<<<<<< HEAD
+=======
 };
 
 /* FastStream codec is just SBC codec with fixed parameters.
@@ -1572,4 +1818,5 @@ const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_faststream = {
         .decode_buffer = decode_buffer_faststream,
         .get_source_output_volume_factor_dB = get_source_output_volume_factor_dB_faststream,
     },
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 };
diff --git a/src/modules/bluetooth/a2dp-codec-util.c b/src/modules/bluetooth/a2dp-codec-util.c
index 43cf34b2d..193f7e1af 100644
--- a/src/modules/bluetooth/a2dp-codec-util.c
+++ b/src/modules/bluetooth/a2dp-codec-util.c
@@ -52,7 +52,10 @@ extern const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_hq;
 extern const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_sq;
 extern const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_ldac_eqmid_mq;
 #endif
+<<<<<<< HEAD
+=======
 extern const pa_a2dp_endpoint_conf pa_a2dp_endpoint_conf_faststream;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 /* This is list of supported codecs. Their order is important.
  * Codec with lower index has higher priority. */
@@ -70,7 +73,10 @@ static const pa_a2dp_endpoint_conf *pa_a2dp_endpoint_configurations[] = {
     &pa_a2dp_endpoint_conf_sbc_xq_453,
     &pa_a2dp_endpoint_conf_sbc_xq_512,
     &pa_a2dp_endpoint_conf_sbc_xq_552,
+<<<<<<< HEAD
+=======
     &pa_a2dp_endpoint_conf_faststream,
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 };
 
 unsigned int pa_bluetooth_a2dp_endpoint_conf_count(void) {
diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c
index 569cc6d36..82da34ff4 100644
--- a/src/modules/bluetooth/backend-native.c
+++ b/src/modules/bluetooth/backend-native.c
@@ -38,18 +38,26 @@
 
 #include "bluez5-util.h"
 #include "bt-codec-msbc.h"
+<<<<<<< HEAD
+=======
 #include "upower.h"
 
 #define MANDATORY_CALL_INDICATORS \
         "(\"call\",(0-1))," \
         "(\"callsetup\",(0-3))," \
         "(\"callheld\",(0-2))" \
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 struct pa_bluetooth_backend {
   pa_core *core;
   pa_dbus_connection *connection;
   pa_bluetooth_discovery *discovery;
   pa_hook_slot *adapter_uuids_changed_slot;
+<<<<<<< HEAD
+  bool enable_shared_profiles;
+  bool enable_hsp_hs;
+  bool enable_hfp_hf;
+=======
   pa_hook_slot *host_battery_level_changed_slot;
   pa_upower_backend *upower;
   bool enable_shared_profiles;
@@ -57,6 +65,7 @@ struct pa_bluetooth_backend {
   bool enable_hfp_hf;
   bool cmer_indicator_reporting_enabled;
   uint32_t cind_enabled_indicators;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
   PA_LLIST_HEAD(pa_dbus_pending, pending);
 };
@@ -78,6 +87,37 @@ struct hfp_config {
     bool supports_indicators;
     int selected_codec;
 };
+<<<<<<< HEAD
+
+/*
+ * the separate hansfree headset (HF) and Audio Gateway (AG) features
+ */
+enum hfp_hf_features {
+    HFP_HF_EC_NR = 0,
+    HFP_HF_CALL_WAITING = 1,
+    HFP_HF_CLI = 2,
+    HFP_HF_VR = 3,
+    HFP_HF_RVOL = 4,
+    HFP_HF_ESTATUS = 5,
+    HFP_HF_ECALL = 6,
+    HFP_HF_CODECS = 7,
+    HFP_HF_INDICATORS = 8,
+};
+
+enum hfp_ag_features {
+    HFP_AG_THREE_WAY = 0,
+    HFP_AG_EC_NR = 1,
+    HFP_AG_VR = 2,
+    HFP_AG_RING = 3,
+    HFP_AG_NUM_TAG = 4,
+    HFP_AG_REJECT = 5,
+    HFP_AG_ESTATUS = 6,
+    HFP_AG_ECALL = 7,
+    HFP_AG_EERR = 8,
+    HFP_AG_CODECS = 9,
+    HFP_AG_INDICATORS = 10,
+};
+=======
 
 /*
  * the separate hansfree headset (HF) and Audio Gateway (AG) features
@@ -121,6 +161,7 @@ typedef enum pa_bluetooth_ag_to_hf_indicators {
     CIND_BATT_CHG_INDICATOR = 5,
     CIND_INDICATOR_MAX = 6
 } pa_bluetooth_ag_to_hf_indicators_t;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 /* gateway features we support, which is as little as we can get away with */
 static uint32_t hfp_features =
@@ -370,6 +411,10 @@ static int sco_acquire_cb(pa_bluetooth_transport *t, bool optional, size_t *imtu
     if (sock < 0)
         goto fail;
 
+<<<<<<< HEAD
+    if (imtu) *imtu = 60;
+    if (omtu) *omtu = 60;
+=======
     /* The correct block size should take into account the SCO MTU from
      * the Bluetooth adapter and (for adapters in the USB bus) the MxPS
      * value from the Isoc USB endpoint in use by btusb and should be
@@ -382,6 +427,7 @@ static int sco_acquire_cb(pa_bluetooth_transport *t, bool optional, size_t *imtu
      */
     if (imtu) *imtu = 144;
     if (omtu) *omtu = 144;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     if (t->device->autodetect_mtu) {
         struct sco_options sco_opt;
@@ -398,6 +444,11 @@ static int sco_acquire_cb(pa_bluetooth_transport *t, bool optional, size_t *imtu
         }
     }
 
+    /* read/decode machinery only works if we get at most one MSBC encoded packet at a time
+     * when it is fixed to process stream of packets, lift this assertion */
+    pa_assert(*imtu <= MSBC_PACKET_SIZE);
+    pa_assert(*omtu <= MSBC_PACKET_SIZE);
+
     return sock;
 
 fail:
@@ -614,6 +665,13 @@ static pa_volume_t set_source_volume(pa_bluetooth_transport *t, pa_volume_t volu
 static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf)
 {
     struct hfp_config *c = t->config;
+<<<<<<< HEAD
+    int indicator, val;
+    char str[5];
+    const char *r;
+    size_t len;
+    const char *state;
+=======
     struct transport_data *trd = t->userdata;
     pa_bluetooth_backend *b = trd->backend;
     int indicator, mode, val;
@@ -621,6 +679,7 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
     const char *r;
     size_t len;
     const char *state = NULL;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     /* first-time initialize selected codec to CVSD */
     if (c->selected_codec == 0)
@@ -635,6 +694,15 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
         c->state = 1;
 
         return true;
+<<<<<<< HEAD
+    } else if (sscanf(buf, "AT+BAC=%3s", str) == 1) {
+        c->support_msbc = false;
+
+        state = NULL;
+
+        /* check if codec id 2 (mSBC) is in the list of supported codecs */
+        while ((r = pa_split_in_place(str, ",", &len, &state))) {
+=======
     } else if (pa_startswith(buf, "AT+BIA=")) {
         /* Indicators start with index 1 and follow the order of the AT+CIND=? response */
 
@@ -670,12 +738,16 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
         /* check if codec id 2 (mSBC) is in the list of supported codecs */
         str = pa_xstrdup(buf + 7);
         while ((r = pa_split_in_place(str, ",\r\n", &len, &state))) {
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             if (len == 1 && r[0] == '2') {
                 c->support_msbc = true;
                 break;
             }
         }
+<<<<<<< HEAD
+=======
         pa_xfree(str);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
         c->support_codec_negotiation = true;
 
@@ -689,6 +761,16 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
 
         return true;
     } else if (c->state == 1 && pa_startswith(buf, "AT+CIND=?")) {
+<<<<<<< HEAD
+        /* we declare minimal no indicators */
+        rfcomm_write_response(fd, "+CIND: "
+                     /* many indicators can be supported, only call and
+                      * callheld are mandatory, so that's all we reply */
+                     "(\"service\",(0-1)),"
+                     "(\"call\",(0-1)),"
+                     "(\"callsetup\",(0-3)),"
+                     "(\"callheld\",(0-2))");
+=======
         /* UPower backend available, declare support for more indicators */
         if (b->upower) {
             rfcomm_write_response(fd, "+CIND: "
@@ -702,18 +784,26 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
                     MANDATORY_CALL_INDICATORS ","
                     "(\"service\",(0-1))");
         }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         c->state = 2;
 
         return true;
     } else if (c->state == 2 && pa_startswith(buf, "AT+CIND?")) {
+<<<<<<< HEAD
+        rfcomm_write_response(fd, "+CIND: 0,0,0,0");
+=======
         if (b->upower)
             rfcomm_write_response(fd, "+CIND: 0,0,0,0,%u", pa_upower_get_battery_level(b->upower));
         else
             rfcomm_write_response(fd, "+CIND: 0,0,0,0");
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         c->state = 3;
 
         return true;
     } else if ((c->state == 2 || c->state == 3) && pa_startswith(buf, "AT+CMER=")) {
+<<<<<<< HEAD
+        rfcomm_write_response(fd, "OK");
+=======
         if (sscanf(buf, "AT+CMER=%d,%*d,%*d,%d", &mode, &val) == 2) {
             /* Bluetooth HFP spec only defines mode == 3 */
             if (mode != 3)
@@ -731,6 +821,7 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
             rfcomm_write_response(fd, "ERROR");
             return false;
         }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
         if (c->support_codec_negotiation) {
             if (c->support_msbc && pa_bluetooth_discovery_get_enable_msbc(t->device->discovery)) {
@@ -816,6 +907,8 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
      * update, but we process only the ones we care about
      */
     return true;
+<<<<<<< HEAD
+=======
 }
 
 static int get_rfcomm_fd(pa_bluetooth_discovery *discovery) {
@@ -867,6 +960,7 @@ static pa_hook_result_t host_battery_level_changed_cb(pa_bluetooth_discovery *y,
         pa_log_debug("Battery level change indicator disabled, skipping notification");
 
     return PA_HOOK_OK;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 }
 
 static void rfcomm_io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
@@ -894,7 +988,10 @@ static void rfcomm_io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_i
         int gain, dummy;
         bool do_reply = false;
         int vendor, product, version, features;
+<<<<<<< HEAD
+=======
         char *buf = rbuf;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         int num;
 
         len = pa_read(fd, rbuf, 511, NULL);
@@ -902,6 +999,96 @@ static void rfcomm_io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_i
             pa_log_error("RFCOMM read error: %s", pa_cstrerror(errno));
             goto fail;
         }
+<<<<<<< HEAD
+        buf[len] = 0;
+        pa_log_debug("RFCOMM << %s", buf);
+
+        /* There are only four HSP AT commands:
+         * AT+VGS=value: value between 0 and 15, sent by the HS to AG to set the speaker gain.
+         * +VGS=value is sent by AG to HS as a response to an AT+VGS command or when the gain
+         * is changed on the AG side.
+         * AT+VGM=value: value between 0 and 15, sent by the HS to AG to set the microphone gain.
+         * +VGM=value is sent by AG to HS as a response to an AT+VGM command or when the gain
+         * is changed on the AG side.
+         * AT+CKPD=200: Sent by HS when headset button is pressed.
+         * RING: Sent by AG to HS to notify of an incoming call. It can safely be ignored because
+         * it does not expect a reply. */
+        if (sscanf(buf, "AT+VGS=%d", &gain) == 1 || sscanf(buf, "\r\n+VGM%*[=:]%d\r\n", &gain) == 1) {
+            if (!t->set_sink_volume) {
+                pa_log_debug("HS/HF peer supports speaker gain control");
+                t->set_sink_volume = set_sink_volume;
+            }
+
+            t->sink_volume = hsp_gain_to_volume(gain);
+            pa_hook_fire(pa_bluetooth_discovery_hook(t->device->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_SINK_VOLUME_CHANGED), t);
+            do_reply = true;
+
+        } else if (sscanf(buf, "AT+VGM=%d", &gain) == 1 || sscanf(buf, "\r\n+VGS%*[=:]%d\r\n", &gain) == 1) {
+            if (!t->set_source_volume) {
+                pa_log_debug("HS/HF peer supports microphone gain control");
+                t->set_source_volume = set_source_volume;
+            }
+
+            t->source_volume = hsp_gain_to_volume(gain);
+            pa_hook_fire(pa_bluetooth_discovery_hook(t->device->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_SOURCE_VOLUME_CHANGED), t);
+            do_reply = true;
+        } else if (sscanf(buf, "AT+CKPD=%d", &dummy) == 1) {
+            do_reply = true;
+        } else if (sscanf(buf, "AT+XAPL=%04x-%04x-%04x,%d", &vendor, &product, &version, &features) == 4) {
+            if (features & 0x2)
+                /* claim, that we support battery status reports */
+                rfcomm_write_response(fd, "+XAPL=iPhone,6");
+            do_reply = true;
+        } else if (sscanf(buf, "AT+IPHONEACCEV=%d", &num) == 1) {
+            char *substr = buf, *keystr;
+            int key, val, i;
+
+            do_reply = true;
+
+            for (i = 0; i < num; ++i) {
+                keystr = strchr(substr, ',');
+                if (!keystr) {
+                    pa_log_warn("%s misses key for argument #%d", buf, i);
+                    do_reply = false;
+                    break;
+                }
+                keystr++;
+                substr = strchr(keystr, ',');
+                if (!substr) {
+                    pa_log_warn("%s misses value for argument #%d", buf, i);
+                    do_reply = false;
+                    break;
+                }
+                substr++;
+
+                key = atoi(keystr);
+                val = atoi(substr);
+
+                switch (key) {
+                    case 1:
+                        pa_log_notice("Battery Level: %d0%%", val + 1);
+                        pa_bluetooth_device_report_battery_level(t->device, (val + 1) * 10, "Apple accessory indication");
+                        break;
+                    case 2:
+                        pa_log_notice("Dock Status: %s", val ? "docked" : "undocked");
+                        break;
+                    default:
+                        pa_log_debug("Unexpected IPHONEACCEV key %#x", key);
+                        break;
+                }
+            }
+            if (!do_reply)
+                rfcomm_write_response(fd, "ERROR");
+        } else if (t->config) { /* t->config is only non-null for hfp profile */
+            do_reply = hfp_rfcomm_handle(fd, t, buf);
+        } else {
+            rfcomm_write_response(fd, "ERROR");
+            do_reply = false;
+        }
+
+        if (do_reply)
+            rfcomm_write_response(fd, "OK");
+=======
         rbuf[len] = 0;
         pa_log_debug("RFCOMM << %s", rbuf);
 
@@ -1003,6 +1190,7 @@ static void rfcomm_io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_i
             else
                 buf = buf + 1; /* skip \r */
         }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 
     return;
@@ -1036,6 +1224,7 @@ static void transport_destroy(pa_bluetooth_transport *t) {
 static pa_volume_t set_sink_volume(pa_bluetooth_transport *t, pa_volume_t volume) {
     struct transport_data *trd = t->userdata;
     uint16_t gain = volume_to_hsp_gain(volume);
+<<<<<<< HEAD
 
     /* Propagate rounding and bound checks */
     volume = hsp_gain_to_volume(gain);
@@ -1045,6 +1234,17 @@ static pa_volume_t set_sink_volume(pa_bluetooth_transport *t, pa_volume_t volume
 
     t->sink_volume = volume;
 
+=======
+
+    /* Propagate rounding and bound checks */
+    volume = hsp_gain_to_volume(gain);
+
+    if (t->sink_volume == volume)
+        return volume;
+
+    t->sink_volume = volume;
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     /* If we are in the AG role, we send an unsolicited result-code to the headset
      * to change the speaker gain. In the HS role, source and sink are swapped,
      * so in this case we notify the AG that the microphone gain has changed
@@ -1061,6 +1261,7 @@ static pa_volume_t set_sink_volume(pa_bluetooth_transport *t, pa_volume_t volume
 static pa_volume_t set_source_volume(pa_bluetooth_transport *t, pa_volume_t volume) {
     struct transport_data *trd = t->userdata;
     uint16_t gain = volume_to_hsp_gain(volume);
+<<<<<<< HEAD
 
     /* Propagate rounding and bound checks */
     volume = hsp_gain_to_volume(gain);
@@ -1070,6 +1271,17 @@ static pa_volume_t set_source_volume(pa_bluetooth_transport *t, pa_volume_t volu
 
     t->source_volume = volume;
 
+=======
+
+    /* Propagate rounding and bound checks */
+    volume = hsp_gain_to_volume(gain);
+
+    if (t->source_volume == volume)
+        return volume;
+
+    t->source_volume = volume;
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     /* If we are in the AG role, we send an unsolicited result-code to the headset
      * to change the microphone gain. In the HS role, source and sink are swapped,
      * so in this case we notify the AG that the speaker gain has changed
@@ -1328,9 +1540,15 @@ static void native_backend_apply_profile_registration_change(pa_bluetooth_backen
             profile_done(native_backend, PA_BLUETOOTH_PROFILE_HFP_HF);
     }
 }
+<<<<<<< HEAD
 
 void pa_bluetooth_native_backend_enable_shared_profiles(pa_bluetooth_backend *native_backend, bool enable) {
 
+=======
+
+void pa_bluetooth_native_backend_enable_shared_profiles(pa_bluetooth_backend *native_backend, bool enable) {
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
    if (enable == native_backend->enable_shared_profiles)
        return;
 
@@ -1365,6 +1583,17 @@ pa_bluetooth_backend *pa_bluetooth_native_backend_new(pa_core *c, pa_bluetooth_d
     backend->adapter_uuids_changed_slot =
         pa_hook_connect(pa_bluetooth_discovery_hook(y, PA_BLUETOOTH_HOOK_ADAPTER_UUIDS_CHANGED), PA_HOOK_NORMAL,
                         (pa_hook_cb_t) adapter_uuids_changed_cb, backend);
+<<<<<<< HEAD
+
+    if (!backend->enable_hsp_hs && !backend->enable_hfp_hf)
+        pa_log_warn("Both HSP HS and HFP HF bluetooth profiles disabled in native backend. Native backend will not register for headset connections.");
+
+    if (backend->enable_hsp_hs)
+        profile_init(backend, PA_BLUETOOTH_PROFILE_HSP_HS);
+
+    if (backend->enable_shared_profiles)
+        native_backend_apply_profile_registration_change(backend, true);
+=======
 
     backend->host_battery_level_changed_slot =
         pa_hook_connect(pa_bluetooth_discovery_hook(y, PA_BLUETOOTH_HOOK_HOST_BATTERY_LEVEL_CHANGED), PA_HOOK_NORMAL,
@@ -1388,6 +1617,7 @@ pa_bluetooth_backend *pa_bluetooth_native_backend_new(pa_core *c, pa_bluetooth_d
     /* While all CIND indicators are enabled, event reporting is not enabled by default */
     backend->cmer_indicator_reporting_enabled = false;
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     return backend;
 }
@@ -1400,17 +1630,23 @@ void pa_bluetooth_native_backend_free(pa_bluetooth_backend *backend) {
     if (backend->adapter_uuids_changed_slot)
         pa_hook_slot_free(backend->adapter_uuids_changed_slot);
 
+<<<<<<< HEAD
+=======
     if (backend->host_battery_level_changed_slot)
         pa_hook_slot_free(backend->host_battery_level_changed_slot);
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (backend->enable_shared_profiles)
         native_backend_apply_profile_registration_change(backend, false);
 
     if (backend->enable_hsp_hs)
         profile_done(backend, PA_BLUETOOTH_PROFILE_HSP_HS);
+<<<<<<< HEAD
+=======
 
     if (backend->upower)
         pa_upower_backend_free(backend->upower);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_dbus_connection_unref(backend->connection);
 
diff --git a/src/modules/bluetooth/backend-ofono.c b/src/modules/bluetooth/backend-ofono.c
index 36fe787cf..a0612cf75 100644
--- a/src/modules/bluetooth/backend-ofono.c
+++ b/src/modules/bluetooth/backend-ofono.c
@@ -333,6 +333,15 @@ static int hf_audio_agent_transport_acquire(pa_bluetooth_transport *t, bool opti
      * value from the Isoc USB endpoint in use by btusb and should be
      * made available to userspace by the Bluetooth kernel subsystem.
      *
+<<<<<<< HEAD
+     * Set initial MTU to max size which is reported to be working (60 bytes)
+     * See also pa_bluetooth_transport::last_read_size handling.
+     */
+    if (imtu)
+        *imtu = 60;
+    if (omtu)
+        *omtu = 60;
+=======
      * Set initial MTU to max known payload length of HCI packet
      * in USB Alternate Setting 5 (144 bytes)
      * See also pa_bluetooth_transport::last_read_size handling
@@ -342,6 +351,7 @@ static int hf_audio_agent_transport_acquire(pa_bluetooth_transport *t, bool opti
         *imtu = 144;
     if (omtu)
         *omtu = 144;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     err = socket_accept(card->fd);
     if (err < 0) {
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 2431b3831..68673b801 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -254,6 +254,10 @@ static const char *transport_state_to_string(pa_bluetooth_transport_state_t stat
     return "invalid";
 }
 
+<<<<<<< HEAD
+static bool device_supports_profile(pa_bluetooth_device *device, pa_bluetooth_profile_t profile) {
+    bool show_hfp, show_hsp;
+=======
 bool pa_bluetooth_device_supports_profile(const pa_bluetooth_device *device, pa_bluetooth_profile_t profile) {
     bool show_hfp, show_hsp, r;
 
@@ -267,6 +271,7 @@ bool pa_bluetooth_device_supports_profile(const pa_bluetooth_device *device, pa_
                 device->alias, device->address, pa_bluetooth_profile_to_string(profile));
         return false;
     }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     if (device->enable_hfp_hf) {
         show_hfp = pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HFP_HF);
@@ -282,6 +287,19 @@ bool pa_bluetooth_device_supports_profile(const pa_bluetooth_device *device, pa_
                       pa_hashmap_get(device->adapter->uuids, PA_BLUETOOTH_UUID_A2DP_SOURCE));
             break;
         case PA_BLUETOOTH_PROFILE_A2DP_SOURCE:
+<<<<<<< HEAD
+            return !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_A2DP_SOURCE);
+        case PA_BLUETOOTH_PROFILE_HSP_HS:
+            return show_hsp
+                && ( !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HSP_HS)
+                  || !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HSP_HS_ALT));
+        case PA_BLUETOOTH_PROFILE_HSP_AG:
+            return !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HSP_AG);
+        case PA_BLUETOOTH_PROFILE_HFP_HF:
+            return show_hfp && !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HFP_HF);
+        case PA_BLUETOOTH_PROFILE_HFP_AG:
+            return !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HFP_AG);
+=======
             r = !!(pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_A2DP_SOURCE) &&
                       pa_hashmap_get(device->adapter->uuids, PA_BLUETOOTH_UUID_A2DP_SINK));
             break;
@@ -307,6 +325,7 @@ bool pa_bluetooth_device_supports_profile(const pa_bluetooth_device *device, pa_
             r = !!(pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HFP_AG) &&
                       pa_hashmap_get(device->adapter->uuids, PA_BLUETOOTH_UUID_HFP_HF));
             break;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         case PA_BLUETOOTH_PROFILE_OFF:
         default:
             pa_assert_not_reached();
@@ -788,7 +807,10 @@ static void get_volume_reply(DBusPendingCall *pending, void *userdata) {
     pa_bluetooth_transport *t;
     uint16_t gain;
     pa_volume_t volume;
+<<<<<<< HEAD
+=======
     const char *error_name, *error_message;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_assert(pending);
     pa_assert_se(p = userdata);
@@ -797,6 +819,12 @@ static void get_volume_reply(DBusPendingCall *pending, void *userdata) {
     pa_assert_se(r = dbus_pending_call_steal_reply(pending));
 
     if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
+<<<<<<< HEAD
+        pa_log_error(DBUS_INTERFACE_PROPERTIES ".Get %s Volume failed: %s: %s",
+                     dbus_message_get_path(p->message),
+                     dbus_message_get_error_name(r),
+                     pa_dbus_get_error_message(r));
+=======
         error_name = dbus_message_get_error_name(r);
         error_message = pa_dbus_get_error_message(r);
 
@@ -809,6 +837,7 @@ static void get_volume_reply(DBusPendingCall *pending, void *userdata) {
                          error_name,
                          error_message);
         }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         goto finish;
     }
     dbus_message_iter_init(r, &iter);
@@ -1202,6 +1231,8 @@ bool pa_bluetooth_discovery_get_enable_msbc(pa_bluetooth_discovery *y)
     return y->enable_msbc;
 }
 
+<<<<<<< HEAD
+=======
 pa_hashmap* pa_bluetooth_discovery_get_transports(pa_bluetooth_discovery *y) {
     pa_assert(y);
     pa_assert(PA_REFCNT_VALUE(y) > 0);
@@ -1209,6 +1240,7 @@ pa_hashmap* pa_bluetooth_discovery_get_transports(pa_bluetooth_discovery *y) {
     return y->transports;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 pa_bluetooth_device* pa_bluetooth_discovery_get_device_by_address(pa_bluetooth_discovery *y, const char *remote, const char *local) {
     pa_bluetooth_device *d;
     void *state = NULL;
@@ -2130,7 +2162,11 @@ void pa_bluetooth_discovery_set_ofono_running(pa_bluetooth_discovery *y, bool is
         pa_bluetooth_device *d;
 
         PA_HASHMAP_FOREACH(d, y->devices, state) {
+<<<<<<< HEAD
+            if (device_supports_profile(d, PA_BLUETOOTH_PROFILE_HFP_AG) || device_supports_profile(d, PA_BLUETOOTH_PROFILE_HFP_HF)) {
+=======
             if (pa_bluetooth_device_supports_profile(d, PA_BLUETOOTH_PROFILE_HFP_AG) || pa_bluetooth_device_supports_profile(d, PA_BLUETOOTH_PROFILE_HFP_HF)) {
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
                 DBusMessage *m;
 
                 pa_assert_se(m = dbus_message_new_method_call(BLUEZ_SERVICE, d->path, BLUEZ_DEVICE_INTERFACE, "Disconnect"));
diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez5-util.h
index fff3d573c..7f02fbc1b 100644
--- a/src/modules/bluetooth/bluez5-util.h
+++ b/src/modules/bluetooth/bluez5-util.h
@@ -69,7 +69,10 @@ typedef enum pa_bluetooth_hook {
     PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED,        /* Call data: pa_bluetooth_device */
     PA_BLUETOOTH_HOOK_DEVICE_UNLINK,                    /* Call data: pa_bluetooth_device */
     PA_BLUETOOTH_HOOK_DEVICE_BATTERY_LEVEL_CHANGED,     /* Call data: pa_bluetooth_device */
+<<<<<<< HEAD
+=======
     PA_BLUETOOTH_HOOK_HOST_BATTERY_LEVEL_CHANGED,       /* Call data: pa_upower_backend */
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED,          /* Call data: pa_bluetooth_transport */
     PA_BLUETOOTH_HOOK_TRANSPORT_SOURCE_VOLUME_CHANGED,  /* Call data: pa_bluetooth_transport */
     PA_BLUETOOTH_HOOK_TRANSPORT_SINK_VOLUME_CHANGED,    /* Call data: pa_bluetooth_transport */
@@ -247,5 +250,8 @@ void pa_bluetooth_discovery_set_ofono_running(pa_bluetooth_discovery *y, bool is
 bool pa_bluetooth_discovery_get_enable_native_hsp_hs(pa_bluetooth_discovery *y);
 bool pa_bluetooth_discovery_get_enable_native_hfp_hf(pa_bluetooth_discovery *y);
 bool pa_bluetooth_discovery_get_enable_msbc(pa_bluetooth_discovery *y);
+<<<<<<< HEAD
+=======
 pa_hashmap* pa_bluetooth_discovery_get_transports(pa_bluetooth_discovery *y);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 #endif
diff --git a/src/modules/bluetooth/bt-codec-api.h b/src/modules/bluetooth/bt-codec-api.h
index 700c28753..436819ebb 100644
--- a/src/modules/bluetooth/bt-codec-api.h
+++ b/src/modules/bluetooth/bt-codec-api.h
@@ -26,9 +26,12 @@ typedef struct pa_bt_codec {
     /* Human readable codec description */
     const char *description;
 
+<<<<<<< HEAD
+=======
     /* True if codec is bi-directional and supports backchannel */
     bool support_backchannel;
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     /* Initialize codec, returns codec info data and set sample_spec,
      * for_encoding is true when codec_info is used for encoding,
      * for_backchannel is true when codec_info is used for backchannel */
@@ -67,7 +70,10 @@ typedef struct pa_bt_codec {
      * returns size of filled ouput_buffer and set processed to size of
      * processed input_buffer */
     size_t (*decode_buffer)(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed);
+<<<<<<< HEAD
+=======
 
     /* Get volume factor which needs to be applied to output samples */
     double (*get_source_output_volume_factor_dB)(void *codec_info);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 } pa_bt_codec;
diff --git a/src/modules/bluetooth/bt-codec-msbc.c b/src/modules/bluetooth/bt-codec-msbc.c
index 7a26e3c61..d7cbd3fa8 100644
--- a/src/modules/bluetooth/bt-codec-msbc.c
+++ b/src/modules/bluetooth/bt-codec-msbc.c
@@ -112,6 +112,9 @@ static size_t get_read_block_size(void *codec_info, size_t link_mtu) {
         block_size = pa_frame_align(block_size, &info->sample_spec);
     }
 
+<<<<<<< HEAD
+    return block_size;
+=======
     /* If MTU exceeds mSBC frame size there could be up to 1 + MTU / (mSBC frame size)
      * frames decoded for single incoming packet.
      * See also pa_bluetooth_transport::last_read_size handling
@@ -121,6 +124,7 @@ static size_t get_read_block_size(void *codec_info, size_t link_mtu) {
         return block_size;
 
     return block_size * (1 + link_mtu / MSBC_PACKET_SIZE);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 }
 
 static size_t get_write_block_size(void *codec_info, size_t link_mtu) {
@@ -212,10 +216,17 @@ static inline bool is_all_zero(const uint8_t *ptr, size_t len) {
 /*
  * We build a msbc frame up in the sbc_info buffer until we have a whole one
  */
+<<<<<<< HEAD
+static struct msbc_frame *msbc_find_frame(struct sbc_info *si, ssize_t *len,
+                                          const uint8_t *buf, int *pseq)
+{
+    int i;
+=======
 static struct msbc_frame *msbc_find_frame(struct sbc_info *si, size_t *len,
                                           const uint8_t *buf, int *pseq)
 {
     size_t i;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     uint8_t *p = si->input_buffer;
 
     /* skip input if it has all zero bytes
@@ -249,7 +260,11 @@ static struct msbc_frame *msbc_find_frame(struct sbc_info *si, size_t *len,
             id1.b = p[1];
             *pseq = (id1.s.sn0 & 0x1) | (id1.s.sn1 & 0x2);
             si->msbc_push_offset = 0;
+<<<<<<< HEAD
+            *len = *len - i;
+=======
             *len -= i + 1;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             return (struct msbc_frame *)p;
         }
         continue;
@@ -263,6 +278,51 @@ static struct msbc_frame *msbc_find_frame(struct sbc_info *si, size_t *len,
 
 static size_t decode_buffer(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed) {
     struct sbc_info *sbc_info = (struct sbc_info *) codec_info;
+<<<<<<< HEAD
+    ssize_t remaining;
+    ssize_t decoded;
+    size_t written = 0;
+    struct msbc_frame *frame;
+    int seq;
+
+    remaining = input_size;
+    frame = msbc_find_frame(sbc_info, &remaining, input_buffer, &seq);
+
+    /* only process when we have a full frame */
+    if (!frame) {
+        *processed = input_size - remaining;
+        return 0;
+    }
+
+    uint8_t lost_packets = (4 + seq - sbc_info->msbc_seq++) % 4;
+
+    if (lost_packets) {
+        pa_log_debug("Lost %d input audio packet(s)", lost_packets);
+        sbc_info->msbc_seq = seq + 1;
+    }
+
+    decoded = sbc_decode(&sbc_info->sbc, frame->payload, MSBC_FRAME_SIZE, output_buffer, output_size, &written);
+
+    /* now we've consumed the sbc_info buffer, start a new one with
+     * the partial frame we have */
+    if (remaining > 0)
+        msbc_find_frame(sbc_info, &remaining, input_buffer + input_size - remaining, &seq);
+
+    pa_assert_fp(remaining == 0);
+
+    if (PA_UNLIKELY(decoded <= 0)) {
+        pa_log_error("mSBC decoding error (%li)", (long) decoded);
+        pa_silence_memory(output_buffer, sbc_info->codesize, &sbc_info->sample_spec);
+        decoded = sbc_info->frame_length;
+        written = sbc_info->codesize;
+    }
+
+    pa_assert_fp((size_t)decoded == sbc_info->frame_length);
+    pa_assert_fp((size_t)written == sbc_info->codesize);
+
+    *processed = input_size - remaining;
+    return written;
+=======
     size_t save_input_size;
     ssize_t decoded;
     size_t written = 0;
@@ -312,6 +372,7 @@ static size_t decode_buffer(void *codec_info, const uint8_t *input_buffer, size_
 
     *processed = total_processed;
     return total_written;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 }
 
 /* Modified SBC codec for HFP Wideband Speech*/
diff --git a/src/modules/bluetooth/meson.build b/src/modules/bluetooth/meson.build
index 0703d5086..fe4a1c5fc 100644
--- a/src/modules/bluetooth/meson.build
+++ b/src/modules/bluetooth/meson.build
@@ -37,7 +37,11 @@ libbluez5_util = shared_library('bluez5-util',
   c_args : [pa_c_args, server_c_args],
   link_args : [nodelete_link_args],
   include_directories : [configinc, topinc],
+<<<<<<< HEAD
+  dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
+=======
   dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep, libm_dep],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   install : true,
   install_rpath : privlibdir,
   install_dir : modlibexecdir,
diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
index dc6809ce5..0f6600c7e 100644
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluez5-device.c
@@ -115,8 +115,11 @@ struct userdata {
 
     pa_hook_slot *sink_volume_changed_slot;
     pa_hook_slot *source_volume_changed_slot;
+<<<<<<< HEAD
+=======
 
     pa_hook_slot *source_output_new_hook_slot;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     pa_bluetooth_discovery *discovery;
     pa_bluetooth_device *device;
@@ -273,18 +276,29 @@ static void connect_ports(struct userdata *u, void *new_data, pa_direction_t dir
 
 static bool bt_prepare_encoder_buffer(struct userdata *u)
 {
+<<<<<<< HEAD
+    size_t encoded_size, reserved_size;
+=======
     size_t encoded_size, reserved_size, encoded_frames;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     pa_assert(u);
     pa_assert(u->bt_codec);
 
     /* If socket write MTU is less than encoded frame size, there could be
      * up to one write MTU of data left in encoder buffer from previous round.
      *
+<<<<<<< HEAD
+     * Reserve space for 2 encoded frames to cover that.
+=======
      * Reserve space for at least 2 encoded frames to cover that.
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
      *
      * Note for A2DP codecs it is expected that size of encoded frame is less
      * than write link MTU. Therefore each encoded frame is sent out completely
      * and there is no used space in encoder buffer before next encoder call.
+<<<<<<< HEAD
+     */
+=======
      *
      * For SCO socket all writes will be of MTU size to match payload length
      * of HCI packet. Depending on selected USB Alternate Setting the payload
@@ -304,10 +318,15 @@ static bool bt_prepare_encoder_buffer(struct userdata *u)
      * See also https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/254#note_779802
      */
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (u->bt_codec->get_encoded_block_size)
         encoded_size = u->bt_codec->get_encoded_block_size(u->encoder_info, u->write_block_size);
     else
         encoded_size = u->write_block_size;
+<<<<<<< HEAD
+
+    reserved_size = 2 * encoded_size;
+=======
 
     encoded_frames = u->write_link_mtu / u->write_block_size + 1;
 
@@ -315,6 +334,7 @@ static bool bt_prepare_encoder_buffer(struct userdata *u)
         encoded_frames = 2;
 
     reserved_size = encoded_frames * encoded_size;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     if (u->encoder_buffer_size < reserved_size) {
         u->encoder_buffer = pa_xrealloc(u->encoder_buffer, reserved_size);
@@ -324,11 +344,19 @@ static bool bt_prepare_encoder_buffer(struct userdata *u)
             u->encoder_buffer_used = 0;
         }
     }
+<<<<<<< HEAD
 
     /* Report if there is still not enough space for new block */
     if (u->encoder_buffer_size < u->encoder_buffer_used + encoded_size)
         return false;
 
+=======
+
+    /* Report if there is still not enough space for new block */
+    if (u->encoder_buffer_size < u->encoder_buffer_used + encoded_size)
+        return false;
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     return true;
 }
 
@@ -413,10 +441,17 @@ static int bt_process_render(struct userdata *u) {
     u->write_index += (uint64_t) u->write_memchunk.length;
     pa_memblock_unref(u->write_memchunk.memblock);
     pa_memchunk_reset(&u->write_memchunk);
+<<<<<<< HEAD
 
     return ret;
 }
 
+=======
+
+    return ret;
+}
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static void bt_prepare_decoder_buffer(struct userdata *u) {
     pa_assert(u);
 
@@ -429,11 +464,19 @@ static void bt_prepare_decoder_buffer(struct userdata *u) {
      * decode method would produce larger output then read_block_size */
     u->decoder_buffer_size = u->read_link_mtu;
 }
+<<<<<<< HEAD
 
 /* Run from IO thread */
 static ssize_t bt_transport_read(pa_bluetooth_transport *t, int fd, void *buffer, size_t size, pa_usec_t *p_timestamp) {
     ssize_t received = 0;
 
+=======
+
+/* Run from IO thread */
+static ssize_t bt_transport_read(pa_bluetooth_transport *t, int fd, void *buffer, size_t size, pa_usec_t *p_timestamp) {
+    ssize_t received = 0;
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     pa_assert(t);
     for (;;) {
         uint8_t aux[1024];
@@ -516,6 +559,16 @@ static int bt_process_push(struct userdata *u) {
     pa_assert(u->read_smoother);
     pa_assert(u->bt_codec);
     pa_assert(u->transport);
+<<<<<<< HEAD
+
+    bt_prepare_decoder_buffer(u);
+
+    received = bt_transport_read(u->transport, u->stream_fd, u->decoder_buffer, u->decoder_buffer_size, &tstamp);
+
+    if (received <= 0) {
+        return received;
+    }
+=======
 
     bt_prepare_decoder_buffer(u);
 
@@ -560,6 +613,37 @@ static int bt_process_push(struct userdata *u) {
 
     /* report decoded size */
     received = memchunk.length;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+
+    pa_memchunk memchunk;
+
+    memchunk.memblock = pa_memblock_new(u->core->mempool, u->read_block_size);
+    memchunk.index = memchunk.length = 0;
+
+    ptr = pa_memblock_acquire(memchunk.memblock);
+    memchunk.length = pa_memblock_get_length(memchunk.memblock);
+
+    memchunk.length = u->bt_codec->decode_buffer(u->decoder_info, u->decoder_buffer, received, ptr, memchunk.length, &processed);
+
+    pa_memblock_release(memchunk.memblock);
+
+    if (processed != (size_t) received) {
+        pa_log_error("Decoding error");
+        return -1;
+    }
+
+    u->read_index += (uint64_t) memchunk.length;
+    pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->decoder_sample_spec));
+    pa_smoother_resume(u->read_smoother, tstamp, true);
+
+    /* Decoding of data may result in empty buffer, in this case
+     * do not post empty audio samples. It may happen due to algorithmic
+     * delay of audio codec. */
+    if (PA_LIKELY(memchunk.length))
+        pa_source_post(u->source, &memchunk);
+
+    /* report decoded size */
+    received = memchunk.length;
 
     pa_memblock_unref(memchunk.memblock);
 
@@ -950,6 +1034,45 @@ static void source_set_volume_cb(pa_source *s) {
 
     pa_cvolume_set(&s->real_volume, u->decoder_sample_spec.channels, volume);
 }
+<<<<<<< HEAD
+
+/* Run from main thread */
+static void source_setup_volume_callback(pa_source *s) {
+    struct userdata *u;
+
+    pa_assert(s);
+    pa_assert(s->core);
+
+    u = s->userdata;
+    pa_assert(u);
+    pa_assert(u->source == s);
+    pa_assert(u->transport);
+
+    if (pa_bluetooth_profile_is_a2dp(u->profile) && !u->transport->device->avrcp_absolute_volume)
+        return;
+
+    /* Remote volume control has to be supported for the callback to make sense,
+     * otherwise this source should continue performing attenuation in software
+     * without HW_VOLUME_CTL.
+     * If the peer is an AG however backend-native unconditionally provides this
+     * function, PA in the role of HS/HF is responsible for signalling support
+     * by emitting an initial volume command.
+     * For A2DP bluez-util also unconditionally provides this function to keep
+     * the peer informed about volume changes.
+     */
+    if (!u->transport->set_source_volume)
+        return;
+
+    if (pa_bluetooth_profile_should_attenuate_volume(u->profile)) {
+        if (u->source_volume_changed_slot)
+            return;
+
+        pa_log_debug("%s: Attaching volume hook to notify peer of changes", s->name);
+
+        u->source_volume_changed_slot = pa_hook_connect(&s->core->hooks[PA_CORE_HOOK_SOURCE_VOLUME_CHANGED],
+                                                        PA_HOOK_NORMAL, sink_source_volume_changed_cb, u);
+
+=======
 
 /* Run from main thread */
 static void source_setup_volume_callback(pa_source *s) {
@@ -993,6 +1116,7 @@ static void source_setup_volume_callback(pa_source *s) {
         u->source_volume_changed_slot = pa_hook_connect(&s->core->hooks[PA_CORE_HOOK_SOURCE_VOLUME_CHANGED],
                                                         PA_HOOK_NORMAL, sink_source_volume_changed_cb, u);
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         /* Send initial volume to peer, signalling support for volume control */
         u->transport->set_source_volume(u->transport, pa_cvolume_max(&s->real_volume));
     } else {
@@ -1180,6 +1304,7 @@ static int sink_set_state_in_io_thread_cb(pa_sink *s, pa_sink_state_t new_state,
 /* Run from main thread */
 static void sink_set_volume_cb(pa_sink *s) {
     pa_volume_t volume;
+<<<<<<< HEAD
     struct userdata *u;
 
     pa_assert(s);
@@ -1199,6 +1324,72 @@ static void sink_set_volume_cb(pa_sink *s) {
     pa_cvolume_set(&s->real_volume, u->encoder_sample_spec.channels, volume);
 }
 
+/* Run from main thread */
+static void sink_setup_volume_callback(pa_sink *s) {
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+    struct userdata *u;
+
+    pa_assert(s);
+    pa_assert(s->core);
+
+    u = s->userdata;
+    pa_assert(u);
+    pa_assert(u->sink == s);
+<<<<<<< HEAD
+    pa_assert(u->transport);
+
+    if (pa_bluetooth_profile_is_a2dp(u->profile) && !u->transport->device->avrcp_absolute_volume)
+        return;
+
+    /* Remote volume control has to be supported for the callback to make sense,
+     * otherwise this sink should continue performing attenuation in software
+     * without HW_VOLUME_CTL.
+     * If the peer is an AG however backend-native unconditionally provides this
+     * function, PA in the role of HS/HF is responsible for signalling support
+     * by emitting an initial volume command.
+     */
+    if (!u->transport->set_sink_volume)
+        return;
+
+    if (pa_bluetooth_profile_should_attenuate_volume(u->profile)) {
+        /* It is yet unknown how (if at all) volume is synchronized for bidirectional
+         * A2DP codecs.  Disallow attaching hooks to a pa_sink if the peer is in
+         * A2DP_SOURCE role.  This assert should be replaced with the proper logic
+         * when bidirectional codecs are implemented.
+         */
+        pa_assert(u->profile != PA_BLUETOOTH_PROFILE_A2DP_SOURCE);
+
+        if (u->sink_volume_changed_slot)
+            return;
+
+        pa_log_debug("%s: Attaching volume hook to notify peer of changes", s->name);
+
+        u->sink_volume_changed_slot = pa_hook_connect(&s->core->hooks[PA_CORE_HOOK_SINK_VOLUME_CHANGED],
+                                                      PA_HOOK_NORMAL, sink_source_volume_changed_cb, u);
+
+        /* Send initial volume to peer, signalling support for volume control */
+        u->transport->set_sink_volume(u->transport, pa_cvolume_max(&s->real_volume));
+    } else {
+        if (s->set_volume == sink_set_volume_cb)
+            return;
+
+        pa_log_debug("%s: Resetting software volume for hardware attenuation by peer", s->name);
+
+        /* Reset local attenuation */
+        pa_sink_set_soft_volume(s, NULL);
+
+=======
+    pa_assert(!pa_bluetooth_profile_should_attenuate_volume(u->profile));
+    pa_assert(u->transport);
+    pa_assert(u->transport->set_sink_volume);
+
+    /* In the AG role, send a command to change speaker gain on the HS/HF */
+    volume = u->transport->set_sink_volume(u->transport, pa_cvolume_max(&s->real_volume));
+
+    pa_cvolume_set(&s->real_volume, u->encoder_sample_spec.channels, volume);
+}
+
 /* Run from main thread */
 static void sink_setup_volume_callback(pa_sink *s) {
     struct userdata *u;
@@ -1257,6 +1448,7 @@ static void sink_setup_volume_callback(pa_sink *s) {
         /* Reset local attenuation */
         pa_sink_set_soft_volume(s, NULL);
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         pa_sink_set_set_volume_callback(s, sink_set_volume_cb);
 
         if (u->profile == PA_BLUETOOTH_PROFILE_A2DP_SINK)
@@ -1341,6 +1533,25 @@ static pa_direction_t get_profile_direction(pa_bluetooth_profile_t p) {
 
     return profile_direction[p];
 }
+<<<<<<< HEAD
+
+/* Run from main thread */
+static int transport_config(struct userdata *u) {
+    pa_assert(u);
+    pa_assert(u->transport);
+    pa_assert(!u->bt_codec);
+    pa_assert(!u->encoder_info);
+    pa_assert(!u->decoder_info);
+
+    u->bt_codec = u->transport->bt_codec;
+    pa_assert(u->bt_codec);
+
+    /* reset encoder buffer contents */
+    u->encoder_buffer_used = 0;
+
+    if (get_profile_direction(u->profile) & PA_DIRECTION_OUTPUT) {
+        u->encoder_info = u->bt_codec->init(true, false, u->transport->config, u->transport->config_size, &u->encoder_sample_spec, u->core);
+=======
 
 /* Run from main thread */
 static int transport_config(struct userdata *u) {
@@ -1362,13 +1573,19 @@ static int transport_config(struct userdata *u) {
 
     if ((get_profile_direction(u->profile) & PA_DIRECTION_OUTPUT) || u->bt_codec->support_backchannel) {
         u->encoder_info = u->bt_codec->init(true, reverse_backchannel, u->transport->config, u->transport->config_size, &u->encoder_sample_spec, u->core);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
         if (!u->encoder_info)
             return -1;
     }
 
+<<<<<<< HEAD
+    if (get_profile_direction(u->profile) & PA_DIRECTION_INPUT) {
+        u->decoder_info = u->bt_codec->init(false, false, u->transport->config, u->transport->config_size, &u->decoder_sample_spec, u->core);
+=======
     if ((get_profile_direction(u->profile) & PA_DIRECTION_INPUT) || u->bt_codec->support_backchannel) {
         u->decoder_info = u->bt_codec->init(false, reverse_backchannel, u->transport->config, u->transport->config_size, &u->decoder_sample_spec, u->core);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
         if (!u->decoder_info) {
             if (u->encoder_info) {
@@ -1631,6 +1848,13 @@ static void thread_func(void *userdata) {
                                 skip_bytes -= bytes_to_render;
                             }
 
+<<<<<<< HEAD
+                            if (u->write_index > 0 && (get_profile_direction(u->profile) & PA_DIRECTION_OUTPUT)) {
+                                size_t new_write_block_size = u->bt_codec->reduce_encoder_bitrate(u->encoder_info, u->write_link_mtu);
+                                if (new_write_block_size) {
+                                    u->write_block_size = new_write_block_size;
+                                    handle_sink_block_size_change(u);
+=======
                             if (u->write_index > 0 && (get_profile_direction(u->profile) & PA_DIRECTION_OUTPUT || u->bt_codec->support_backchannel)) {
                                 if (u->bt_codec->reduce_encoder_bitrate) {
                                     size_t new_write_block_size = u->bt_codec->reduce_encoder_bitrate(u->encoder_info, u->write_link_mtu);
@@ -1639,7 +1863,9 @@ static void thread_func(void *userdata) {
                                         handle_sink_block_size_change(u);
                                     }
                                     pa_gettimeofday(&tv_last_output_rate_change);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
                                 }
+                                pa_gettimeofday(&tv_last_output_rate_change);
                             }
                         }
 
@@ -1663,12 +1889,15 @@ static void thread_func(void *userdata) {
                             goto fail;
 
                         if (result) {
+<<<<<<< HEAD
+=======
                             if (have_source && u->read_index <= 0) {
                                 /* We have a source but peer has not sent any data yet, log this */
                                 if (pa_log_ratelimit(PA_LOG_DEBUG))
                                     pa_log_debug("Still no data received from source, sent one more block to sink");
                             }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
                             writable = false;
                             have_written = true;
                         }
@@ -1688,7 +1917,11 @@ static void thread_func(void *userdata) {
                             sleep_for = time_passed < next_write_at ? next_write_at - time_passed : 0;
                             /* pa_log("Sleeping for %lu; time passed %lu, next write at %lu", (unsigned long) sleep_for, (unsigned long) time_passed, (unsigned long)next_write_at); */
 
+<<<<<<< HEAD
+                            if ((get_profile_direction(u->profile) & PA_DIRECTION_OUTPUT) && u->write_memchunk.memblock == NULL) {
+=======
                             if ((get_profile_direction(u->profile) & PA_DIRECTION_OUTPUT || u->bt_codec->support_backchannel) && u->write_memchunk.memblock == NULL) {
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
                                 /* bt_write_buffer() is keeping up with input, try increasing bitrate */
                                 if (u->bt_codec->increase_encoder_bitrate
                                     && pa_timeval_age(&tv_last_output_rate_change) >= u->device->output_rate_refresh_interval_ms * PA_USEC_PER_MSEC) {
@@ -2603,10 +2836,17 @@ static int bluez5_device_message_handler(const char *object_path, const char *me
     pa_bluetooth_profile_t profile;
     const pa_a2dp_endpoint_conf *endpoint_conf;
     const char *codec_name;
+<<<<<<< HEAD
+    struct userdata *u;
+    bool is_a2dp_sink;
+
+    pa_assert(u = (struct userdata *)userdata);
+=======
     struct userdata *u = userdata;
     bool is_a2dp_sink;
 
     pa_assert(u);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     pa_assert(message);
     pa_assert(response);
 
@@ -2867,8 +3107,11 @@ int pa__init(pa_module* m) {
 
     u->transport_source_volume_changed_slot =
         pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_SOURCE_VOLUME_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_source_volume_changed_cb, u);
+<<<<<<< HEAD
+=======
 
     u->source_output_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_NEW], PA_HOOK_EARLY, (pa_hook_cb_t) a2dp_source_output_fixate_hook_callback, u);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     if (add_card(u) < 0)
         goto fail;
diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc
index 6f3213fe5..f86c9c222 100644
--- a/src/modules/echo-cancel/webrtc.cc
+++ b/src/modules/echo-cancel/webrtc.cc
@@ -75,6 +75,38 @@ static const char* const valid_modargs[] = {
     NULL
 };
 
+<<<<<<< HEAD
+static int routing_mode_from_string(const char *rmode) {
+    if (pa_streq(rmode, "quiet-earpiece-or-headset"))
+        return webrtc::EchoControlMobile::kQuietEarpieceOrHeadset;
+    else if (pa_streq(rmode, "earpiece"))
+        return webrtc::EchoControlMobile::kEarpiece;
+    else if (pa_streq(rmode, "loud-earpiece"))
+        return webrtc::EchoControlMobile::kLoudEarpiece;
+    else if (pa_streq(rmode, "speakerphone"))
+        return webrtc::EchoControlMobile::kSpeakerphone;
+    else if (pa_streq(rmode, "loud-speakerphone"))
+        return webrtc::EchoControlMobile::kLoudSpeakerphone;
+    else
+        return -1;
+}
+
+class PaWebrtcTraceCallback : public webrtc::TraceCallback {
+    void Print(webrtc::TraceLevel level, const char *message, int length)
+    {
+        if (level & webrtc::kTraceError || level & webrtc::kTraceCritical)
+            pa_log("%s", message);
+        else if (level & webrtc::kTraceWarning)
+            pa_log_warn("%s", message);
+        else if (level & webrtc::kTraceInfo)
+            pa_log_info("%s", message);
+        else
+            pa_log_debug("%s", message);
+    }
+};
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static int webrtc_volume_from_pa(pa_volume_t v)
 {
     return (v * WEBRTC_AGC_MAX_VOLUME) / PA_VOLUME_NORM;
diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index f43fe6556..00e135779 100644
--- a/src/modules/jack/module-jackdbus-detect.c
+++ b/src/modules/jack/module-jackdbus-detect.c
@@ -71,13 +71,19 @@ PA_MODULE_USAGE(
 
 static const char* const valid_modargs[] = {
     "channels",
+<<<<<<< HEAD
+=======
     "sink_enabled",
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     "sink_name",
     "sink_properties",
     "sink_client_name",
     "sink_channels",
     "sink_channel_map",
+<<<<<<< HEAD
+=======
     "source_enabled",
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     "source_name",
     "source_properties",
     "source_client_name",
@@ -102,7 +108,10 @@ static const char* const modtypes[JACK_SS_COUNT] = {
 };
 
 struct moddata {
+<<<<<<< HEAD
+=======
     bool enabled;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     char *name;
     pa_proplist *proplist;
     char *client_name;
@@ -181,7 +190,11 @@ static void ensure_ports_started(struct userdata* u) {
     pa_assert(u);
 
     for (i = 0; i < JACK_SS_COUNT; i++)
+<<<<<<< HEAD
+        if (!u->jack_module_index[i]) {
+=======
         if (u->mod_args[i].enabled && !u->jack_module_index[i]) {
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             pa_strbuf *args_buf = pa_strbuf_new();
             char *args;
             pa_module *m;
@@ -190,6 +203,7 @@ static void ensure_ports_started(struct userdata* u) {
                 escaped = pa_escape(u->mod_args[i].name, "'");
                 pa_strbuf_printf(args_buf, " %s_name='%s'", modtypes[i], escaped);
                 pa_xfree(escaped);
+<<<<<<< HEAD
             }
             if (!pa_proplist_isempty(u->mod_args[i].proplist)) {
                 escaped = proplist_to_arg(u->mod_args[i].proplist);
@@ -208,6 +222,26 @@ static void ensure_ports_started(struct userdata* u) {
                 pa_channel_map_snprint(cm, sizeof(cm), &u->mod_args[i].channel_map);
                 pa_strbuf_printf(args_buf, " channel_map='%s'", cm);
             }
+=======
+            }
+            if (!pa_proplist_isempty(u->mod_args[i].proplist)) {
+                escaped = proplist_to_arg(u->mod_args[i].proplist);
+                pa_strbuf_printf(args_buf, " %s_properties='%s'", modtypes[i], escaped);
+                pa_xfree(escaped);
+            }
+            if (u->mod_args[i].client_name) {
+                escaped = pa_escape(u->mod_args[i].client_name, "'");
+                pa_strbuf_printf(args_buf, " client_name='%s'", escaped);
+                pa_xfree(escaped);
+            }
+            if (u->mod_args[i].channels > 0)
+                pa_strbuf_printf(args_buf, " channels=%" PRIu32, u->mod_args[i].channels);
+            if (u->mod_args[i].channel_map.channels > 0) {
+                char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+                pa_channel_map_snprint(cm, sizeof(cm), &u->mod_args[i].channel_map);
+                pa_strbuf_printf(args_buf, " channel_map='%s'", cm);
+            }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             args = pa_strbuf_to_string_free(args_buf);
             pa_module_load(&m, u->core, modnames[i], args);
             pa_xfree(args);
@@ -343,6 +377,23 @@ int pa__init(pa_module *m) {
     }
 
     for (i = 0; i < JACK_SS_COUNT; i++) {
+<<<<<<< HEAD
+        pa_snprintf(argname, sizeof(argname), "%s_name", modtypes[i]);
+        name = pa_modargs_get_value(ma, argname, NULL);
+        u->mod_args[i].name = pa_xstrdup(name);
+
+        u->mod_args[i].proplist = pa_proplist_new();
+        pa_snprintf(argname, sizeof(argname), "%s_properties", modtypes[i]);
+        if (pa_modargs_get_proplist(ma, argname, u->mod_args[i].proplist, PA_UPDATE_REPLACE) < 0) {
+            pa_log("Invalid %s properties", modtypes[i]);
+            goto fail;
+        }
+
+        pa_snprintf(argname, sizeof(argname), "%s_client_name", modtypes[i]);
+        name = pa_modargs_get_value(ma, argname, NULL);
+        u->mod_args[i].client_name = pa_xstrdup(name);
+
+=======
         u->mod_args[i].enabled = true;
         pa_snprintf(argname, sizeof(argname), "%s_enabled", modtypes[i]);
         if (pa_modargs_get_value_boolean(ma, argname, &u->mod_args[i].enabled) < 0) {
@@ -365,6 +416,7 @@ int pa__init(pa_module *m) {
         name = pa_modargs_get_value(ma, argname, NULL);
         u->mod_args[i].client_name = pa_xstrdup(name);
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         u->mod_args[i].channels = channels;
         pa_snprintf(argname, sizeof(argname), "%s_channels", modtypes[i]);
         if (pa_modargs_get_value_u32(ma, argname, &u->mod_args[i].channels) < 0
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 05267c93a..260867ca2 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -70,11 +70,17 @@ endif
 
 if host_machine.system() != 'windows'
   all_modules += [
+<<<<<<< HEAD
+    [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [], librtp ],
+=======
     [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [libatomic_ops_dep], librtp ],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     [ 'module-rtp-send', 'rtp/module-rtp-send.c' , [], [], [], librtp ],
   ]
 endif
 
+<<<<<<< HEAD
+=======
 if host_machine.system() == 'darwin'
   bonjour_dep = dependency('appleframeworks', modules : ['CoreFoundation'])
   coreaudio_dep = dependency('appleframeworks', modules : ['CoreAudio'])
@@ -85,6 +91,7 @@ if host_machine.system() == 'darwin'
   ]
 endif
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 # Modules enabled by headers
 
 if cc.has_header('linux/input.h')
@@ -167,13 +174,23 @@ if fftw_dep.found()
   ]
 endif
 
+if fftw_dep.found()
+  all_modules += [
+    [ 'module-virtual-surround-sink', 'module-virtual-surround-sink.c', [], [], [fftw_dep, libm_dep] ],
+  ]
+endif
+
 if dbus_dep.found() and fftw_dep.found()
   all_modules += [
     [ 'module-equalizer-sink', 'module-equalizer-sink.c', [], [], [dbus_dep, fftw_dep, libm_dep] ],
   ]
 endif
 
+<<<<<<< HEAD
+if get_option('gsettings').enabled() and gio_dep.found()
+=======
 if get_option('gsettings').enabled() and glib_dep.found() and gio_dep.found()
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   subdir('gsettings')
   all_modules += [
     [ 'module-gsettings',
@@ -334,7 +351,11 @@ foreach m : all_modules
     install_rpath : rpath_dirs,
     install_dir : modlibexecdir,
     dependencies : [thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep, platform_dep, platform_socket_dep] + extra_deps,
+<<<<<<< HEAD
+    link_args : [nodelete_link_args, '-Wl,--no-undefined' ],
+=======
     link_args : [nodelete_link_args, no_undefined_args],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     link_with : extra_libs,
     name_prefix : '',
     name_suffix : module_suffix,
diff --git a/src/modules/module-tunnel-sink-new.c b/src/modules/module-tunnel-sink-new.c
index 0b91ce266..5f01a3dcc 100644
--- a/src/modules/module-tunnel-sink-new.c
+++ b/src/modules/module-tunnel-sink-new.c
@@ -345,6 +345,8 @@ static void stream_overflow_callback(pa_stream *stream, void *userdata) {
     pa_log_info("Server signalled buffer overrun.");
 }
 
+<<<<<<< HEAD
+=======
 /* Do a reinit of the module.  Note that u will be freed as a result of this
  * call. */
 static void maybe_restart(struct module_restart_data *rd) {
@@ -426,6 +428,7 @@ static void on_sink_created(struct userdata *u) {
     u->connected = true;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static void context_state_cb(pa_context *c, void *userdata) {
     struct userdata *u = userdata;
     pa_assert(u);
@@ -445,8 +448,49 @@ static void context_state_cb(pa_context *c, void *userdata) {
             pa_assert(!u->stream);
             pa_assert(!u->sink);
 
+<<<<<<< HEAD
+            proplist = tunnel_new_proplist(u);
+            u->stream = pa_stream_new_with_proplist(u->context,
+                                                    stream_name,
+                                                    &u->sink->sample_spec,
+                                                    &u->sink->channel_map,
+                                                    proplist);
+            pa_proplist_free(proplist);
+            pa_xfree(stream_name);
+
+            if (!u->stream) {
+                pa_log_error("Could not create a stream.");
+                u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
+                return;
+            }
+
+            requested_latency = pa_sink_get_requested_latency_within_thread(u->sink);
+            if (requested_latency == (pa_usec_t) -1)
+                requested_latency = u->sink->thread_info.max_latency;
+
+            reset_bufferattr(&bufferattr);
+            bufferattr.tlength = pa_usec_to_bytes(requested_latency, &u->sink->sample_spec);
+
+            pa_log_debug("tlength requested at %lu.", (unsigned long) bufferattr.tlength);
+
+            pa_stream_set_state_callback(u->stream, stream_state_cb, userdata);
+            pa_stream_set_buffer_attr_callback(u->stream, stream_changed_buffer_attr_cb, userdata);
+            pa_stream_set_underflow_callback(u->stream, stream_underflow_callback, userdata);
+            pa_stream_set_overflow_callback(u->stream, stream_overflow_callback, userdata);
+            if (pa_stream_connect_playback(u->stream,
+                                           u->remote_sink_name,
+                                           &bufferattr,
+                                           PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_DONT_MOVE | PA_STREAM_START_CORKED | PA_STREAM_AUTO_TIMING_UPDATE,
+                                           NULL,
+                                           NULL) < 0) {
+                pa_log_error("Could not connect stream.");
+                u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
+            }
+            u->connected = true;
+=======
             pa_log_debug("Asking ctl thread to create sink.");
             pa_asyncmsgq_post(u->thread_mq->outq, PA_MSGOBJECT(u->msg), TUNNEL_MESSAGE_CREATE_SINK_REQUEST, u, 0, NULL, NULL);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             break;
         case PA_CONTEXT_FAILED:
             pa_log_debug("Context failed: %s.", pa_strerror(pa_context_errno(u->context)));
diff --git a/src/modules/module-virtual-surround-sink.c b/src/modules/module-virtual-surround-sink.c
index 395146c02..412e5ef12 100644
--- a/src/modules/module-virtual-surround-sink.c
+++ b/src/modules/module-virtual-surround-sink.c
@@ -449,6 +449,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes_input, pa_memchunk
 
     pa_memzero(u->outspace[0], BLOCK_SIZE * 4);
     pa_memzero(u->outspace[1], BLOCK_SIZE * 4);
+<<<<<<< HEAD
 
     for (c = 0; c < u->inputs; c++) {
         fftwf_complex *f_in = u->f_in;
@@ -460,6 +461,19 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes_input, pa_memchunk
             fftwf_complex *f_ir = u->f_ir[c * 2 + ear];
             float *outspace = u->outspace[ear];
 
+=======
+
+    for (c = 0; c < u->inputs; c++) {
+        fftwf_complex *f_in = u->f_in;
+        fftwf_complex *f_out = u->f_out;
+
+        fftwf_execute(u->p_fw[c]);
+
+        for (ear = 0; ear < 2; ear++) {
+            fftwf_complex *f_ir = u->f_ir[c * 2 + ear];
+            float *outspace = u->outspace[ear];
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
             for (s = 0, fftlen = u->fftlen / 2 + 1; s < fftlen; s++) {
                 float re = f_ir[s][0] * f_in[s][0] - f_ir[s][1] * f_in[s][1];
                 float im = f_ir[s][1] * f_in[s][0] + f_ir[s][0] * f_in[s][1];
@@ -479,6 +493,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes_input, pa_memchunk
     for (s = 0, fftlen = BLOCK_SIZE; s < fftlen; s++) {
         float output;
         float *outspace = u->outspace[0];
+<<<<<<< HEAD
 
         output = outspace[s];
         if (output < -1.0) output = -1.0;
@@ -487,6 +502,16 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes_input, pa_memchunk
 
         outspace = u->outspace[1];
 
+=======
+
+        output = outspace[s];
+        if (output < -1.0) output = -1.0;
+        if (output > 1.0) output = 1.0;
+        dst[s * 2 + 0] = output;
+
+        outspace = u->outspace[1];
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         output = outspace[s];
         if (output < -1.0) output = -1.0;
         if (output > 1.0) output = 1.0;
@@ -724,6 +749,7 @@ int pa__init(pa_module*m) {
     size_t hrir_copied_length, hrir_total_length;
     int hrir_channels;
     int fftlen;
+<<<<<<< HEAD
 
     float *impulse_temp=NULL;
 
@@ -732,6 +758,16 @@ int pa__init(pa_module*m) {
 
     fftwf_plan p;
 
+=======
+
+    float *impulse_temp=NULL;
+
+    unsigned *mapping_left=NULL;
+    unsigned *mapping_right=NULL;
+
+    fftwf_plan p;
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     pa_channel_map hrir_map, hrir_right_map;
 
     pa_sample_spec hrir_left_temp_ss;
@@ -1150,10 +1186,17 @@ fail:
 
     if (mapping_right)
         pa_xfree(mapping_right);
+<<<<<<< HEAD
 
     if (hrir_data)
         pa_xfree(hrir_data);
 
+=======
+
+    if (hrir_data)
+        pa_xfree(hrir_data);
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (hrir_right_data)
         pa_xfree(hrir_right_data);
 
@@ -1212,6 +1255,7 @@ void pa__done(pa_module*m) {
 
     if (u->memblockq_sink)
         pa_memblockq_free(u->memblockq_sink);
+<<<<<<< HEAD
 
     if (u->p_fw) {
         for (i = 0, j = u->inputs; i < j; i++) {
@@ -1246,6 +1290,42 @@ void pa__done(pa_module*m) {
     if (u->outspace[1])
         fftwf_free(u->outspace[1]);
 
+=======
+
+    if (u->p_fw) {
+        for (i = 0, j = u->inputs; i < j; i++) {
+            if (u->p_fw[i])
+                fftwf_destroy_plan(u->p_fw[i]);
+        }
+        fftwf_free(u->p_fw);
+    }
+
+    if (u->p_bw)
+        fftwf_destroy_plan(u->p_bw);
+
+    if (u->f_ir) {
+        for (i = 0, j = u->inputs * 2; i < j; i++) {
+            if (u->f_ir[i])
+                fftwf_free(u->f_ir[i]);
+        }
+        fftwf_free(u->f_ir);
+    }
+
+    if (u->f_out)
+        fftwf_free(u->f_out);
+
+    if (u->f_in)
+        fftwf_free(u->f_in);
+
+    if (u->revspace)
+        fftwf_free(u->revspace);
+
+    if (u->outspace[0])
+        fftwf_free(u->outspace[0]);
+    if (u->outspace[1])
+        fftwf_free(u->outspace[1]);
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (u->inspace) {
         for (i = 0, j = u->inputs; i < j; i++) {
             if (u->inspace[i])
diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
index 51b305fe8..73b394814 100644
--- a/src/modules/x11/module-x11-xsmp.c
+++ b/src/modules/x11/module-x11-xsmp.c
@@ -60,26 +60,7 @@ struct userdata {
     pa_x11_client *x11_client;
 };
 
-typedef struct {
-    IceConn connection;
-    struct userdata *userdata;
-} ice_io_callback_data;
-
-static void* ice_io_cb_data_new(IceConn connection, struct userdata *userdata) {
-    ice_io_callback_data *data = pa_xnew(ice_io_callback_data, 1);
-
-    data->connection = connection;
-    data->userdata = userdata;
-
-    return data;
-}
-
-static void ice_io_cb_data_destroy(pa_mainloop_api*a, pa_io_event *e, void *userdata) {
-    pa_assert(userdata);
-
-    pa_xfree(userdata);
-}
-
+<<<<<<< HEAD
 static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) {
     struct userdata *u = userdata;
 
@@ -107,6 +88,60 @@ static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) {
     pa_module_unload_request(u->module, true);
 }
 
+static void die_cb(SmcConn connection, SmPointer client_data) {
+    struct userdata *u = client_data;
+=======
+typedef struct {
+    IceConn connection;
+    struct userdata *userdata;
+} ice_io_callback_data;
+
+static void* ice_io_cb_data_new(IceConn connection, struct userdata *userdata) {
+    ice_io_callback_data *data = pa_xnew(ice_io_callback_data, 1);
+
+    data->connection = connection;
+    data->userdata = userdata;
+
+    return data;
+}
+
+static void ice_io_cb_data_destroy(pa_mainloop_api*a, pa_io_event *e, void *userdata) {
+    pa_assert(userdata);
+
+    pa_xfree(userdata);
+}
+
+static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) {
+    struct userdata *u = userdata;
+
+    pa_assert(w);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+    pa_assert(u);
+    pa_assert(u->x11_wrapper == w);
+
+    pa_log_debug("X11 client kill callback called");
+
+    if (u->connection) {
+        SmcCloseConnection(u->connection, 0, NULL);
+        u->connection = NULL;
+    }
+<<<<<<< HEAD
+=======
+
+    if (u->x11_client) {
+        pa_x11_client_free(u->x11_client);
+        u->x11_client = NULL;
+    }
+
+    if (u->x11_wrapper) {
+        pa_x11_wrapper_unref(u->x11_wrapper);
+        u->x11_wrapper = NULL;
+    }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
+
+    pa_x11_wrapper_kill_deferred(u->x11_wrapper);
+}
+
 static void close_xsmp_connection(struct userdata *userdata) {
     pa_assert(userdata);
 
@@ -149,8 +184,15 @@ static void ice_io_cb(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_fla
 
         IceSetShutdownNegotiation(io_data->connection, False);
 
+<<<<<<< HEAD
+    if (IceProcessMessages(connection, NULL, NULL) == IceProcessMessagesIOError) {
+        pa_log_debug("IceProcessMessages: I/O error, closing ICE connection");
+        IceSetShutdownNegotiation(connection, False);
+        IceCloseConnection(connection);
+=======
         /* SM owns this connection, close via SmcCloseConnection() */
         close_xsmp_connection(io_data->userdata);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 }
 
@@ -183,6 +225,17 @@ static void ice_io_error_handler(IceConn iceConn) {
       (*ice_installed_handler) (iceConn);
 }
 
+static IceIOErrorHandler ice_installed_handler;
+
+/* We call any handler installed before (or after) module is loaded but
+   avoid calling the default libICE handler which does an exit() */
+
+static void ice_io_error_handler(IceConn iceConn) {
+    pa_log_warn("ICE I/O error handler called");
+    if (ice_installed_handler)
+      (*ice_installed_handler) (iceConn);
+}
+
 int pa__init(pa_module*m) {
 
     pa_modargs *ma = NULL;
@@ -202,14 +255,27 @@ int pa__init(pa_module*m) {
         return -1;
     } else {
         IceIOErrorHandler default_handler;
+<<<<<<< HEAD
 
         ice_installed_handler = IceSetIOErrorHandler (NULL);
         default_handler = IceSetIOErrorHandler (ice_io_error_handler);
 
+=======
+
+        ice_installed_handler = IceSetIOErrorHandler (NULL);
+        default_handler = IceSetIOErrorHandler (ice_io_error_handler);
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         if (ice_installed_handler == default_handler)
             ice_installed_handler = NULL;
 
         IceSetIOErrorHandler(ice_io_error_handler);
+<<<<<<< HEAD
+
+        IceAddConnectionWatch(new_ice_connection, m->core);
+        ice_in_use = true;
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 
     m->userdata = u = pa_xnew(struct userdata, 1);
@@ -218,9 +284,12 @@ int pa__init(pa_module*m) {
     u->client = NULL;
     u->connection = NULL;
     u->x11_wrapper = NULL;
+<<<<<<< HEAD
+=======
 
     IceAddConnectionWatch(new_ice_connection, u);
     ice_in_use = true;
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
     if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
         pa_log("Failed to parse module arguments");
@@ -348,6 +417,12 @@ void pa__done(pa_module*m) {
 
         if (u->x11_client)
             pa_x11_client_free(u->x11_client);
+<<<<<<< HEAD
+
+        if (u->x11_wrapper)
+            pa_x11_wrapper_unref(u->x11_wrapper);
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
         if (u->x11_wrapper)
             pa_x11_wrapper_unref(u->x11_wrapper);
diff --git a/src/pulse/meson.build b/src/pulse/meson.build
index c132630f3..ceb518391 100644
--- a/src/pulse/meson.build
+++ b/src/pulse/meson.build
@@ -70,6 +70,13 @@ if glib_dep.found()
   libpulse_headers += 'glib-mainloop.h'
 endif
 
+<<<<<<< HEAD
+run_target('update-map-file',
+  command : [ join_paths(meson.source_root(), 'scripts/generate-map-file.sh'), 'map-file',
+              [ libpulse_headers, 'simple.h', join_paths(meson.build_root(), 'src', 'pulse', 'version.h') ] ])
+
+versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'pulse', 'map-file')
+=======
 if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
   run_target('update-map-file',
     command : [ join_paths(meson.source_root(), 'scripts/generate-map-file.sh'), 'map-file', 'libpulse.def',
@@ -79,6 +86,7 @@ if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
 else
   versioning_link_args = []
 endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 libpulse = shared_library('pulse',
   libpulse_sources,
@@ -89,10 +97,15 @@ libpulse = shared_library('pulse',
   link_args : [nodelete_link_args, versioning_link_args],
   install : true,
   install_rpath : privlibdir,
+<<<<<<< HEAD
+  dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep],
+  implicit_include_directories : false)
+=======
   dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep, libatomic_ops_dep],
   implicit_include_directories : false,
   vs_module_defs : 'libpulse.def',
 )
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 libpulse_dep = declare_dependency(link_with: libpulse)
 
diff --git a/src/pulse/util.c b/src/pulse/util.c
index c7b828cc2..d51db5c0a 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -228,7 +228,11 @@ char *pa_get_binary_name(char *s, size_t l) {
     }
 #endif
 
+<<<<<<< HEAD
+#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__))
+=======
 #if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GNU__)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     {
         char *rp;
         /* This works on Linux and Debian/kFreeBSD */
diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index 4f5997d2c..31d322aba 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -467,10 +467,17 @@ int pa_card_suspend(pa_card *c, bool suspend, pa_suspend_cause_t cause) {
 }
 
 static int card_message_handler(const char *object_path, const char *message, const pa_json_object *parameters, char **response, void *userdata) {
+<<<<<<< HEAD
+    pa_card *c;
+    char *message_handler_path;
+
+    pa_assert(c = (pa_card *) userdata);
+=======
     pa_card *c = userdata;
     char *message_handler_path;
 
     pa_assert(c);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     pa_assert(message);
     pa_assert(response);
 
diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index df7b72461..b3f6dea0f 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -40,7 +40,10 @@
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/strbuf.h>
+<<<<<<< HEAD
+=======
 #include <pulsecore/namereg.h>
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #include "core.h"
 
@@ -87,9 +90,15 @@ static char *message_handler_list(pa_core *c) {
 }
 
 static int core_message_handler(const char *object_path, const char *message, const pa_json_object *parameters, char **response, void *userdata) {
+<<<<<<< HEAD
+    pa_core *c;
+
+    pa_assert(c = (pa_core *) userdata);
+=======
     pa_core *c = userdata;
 
     pa_assert(c);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     pa_assert(message);
     pa_assert(response);
     pa_assert(pa_safe_streq(object_path, "/core"));
diff --git a/src/pulsecore/creds.h b/src/pulsecore/creds.h
index acfdd9d43..d4d2dad96 100644
--- a/src/pulsecore/creds.h
+++ b/src/pulsecore/creds.h
@@ -34,7 +34,11 @@
 typedef struct pa_creds pa_creds;
 typedef struct pa_cmsg_ancil_data pa_cmsg_ancil_data;
 
+<<<<<<< HEAD
+#if defined(SCM_CREDENTIALS) || defined(SCM_CREDS)
+=======
 #if (defined(SCM_CREDENTIALS) || defined(SCM_CREDS)) && !defined(OS_IS_DARWIN)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 #define HAVE_CREDS 1
 
diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c
index 002513839..31d150faa 100644
--- a/src/pulsecore/iochannel.c
+++ b/src/pulsecore/iochannel.c
@@ -261,7 +261,11 @@ ssize_t pa_iochannel_read(pa_iochannel*io, void*data, size_t l) {
 
 #ifdef HAVE_CREDS
 
+<<<<<<< HEAD
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+=======
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 typedef struct cmsgcred pa_ucred_t;
 #define SCM_CREDENTIALS SCM_CREDS
 #else
@@ -291,14 +295,22 @@ bool pa_iochannel_creds_supported(pa_iochannel *io) {
 }
 
 int pa_iochannel_creds_enable(pa_iochannel *io) {
+<<<<<<< HEAD
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+=======
 #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     int t = 1;
 #endif
 
     pa_assert(io);
     pa_assert(io->ifd >= 0);
 
+<<<<<<< HEAD
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+=======
 #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     if (setsockopt(io->ifd, SOL_SOCKET, SO_PASSCRED, &t, sizeof(t)) < 0) {
         pa_log_error("setsockopt(SOL_SOCKET, SO_PASSCRED): %s", pa_cstrerror(errno));
         return -1;
@@ -334,7 +346,11 @@ ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l
 
     u = (pa_ucred_t*) CMSG_DATA(&cmsg.hdr);
 
+<<<<<<< HEAD
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+=======
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     // the kernel fills everything
 #else
     u->pid = getpid();
@@ -457,7 +473,11 @@ ssize_t pa_iochannel_read_with_ancil_data(pa_iochannel*io, void*data, size_t l,
                 pa_ucred_t u;
                 pa_assert(cmh->cmsg_len == CMSG_LEN(sizeof(pa_ucred_t)));
                 memcpy(&u, CMSG_DATA(cmh), sizeof(pa_ucred_t));
+<<<<<<< HEAD
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+=======
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
                 ancil_data->creds.gid = u.cmcred_gid;
                 ancil_data->creds.uid = u.cmcred_uid;
 #else
diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
index b37fec499..19c0111aa 100644
--- a/src/pulsecore/meson.build
+++ b/src/pulsecore/meson.build
@@ -224,7 +224,11 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
   install_rpath : privlibdir,
   install_dir : privlibdir,
   link_with : libpulsecore_simd_lib,
+<<<<<<< HEAD
+  dependencies : [libm_dep, libpulsecommon_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libintl_dep, platform_dep, platform_socket_dep,],
+=======
   dependencies : [libm_dep, libpulsecommon_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libsystemd_dep, libintl_dep, platform_dep, tcpwrap_dep, platform_socket_dep,],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   implicit_include_directories : false)
 
 libpulsecore_dep = declare_dependency(link_with: libpulsecore)
diff --git a/src/pulsecore/message-handler.c b/src/pulsecore/message-handler.c
index 41adbfda7..203254281 100644
--- a/src/pulsecore/message-handler.c
+++ b/src/pulsecore/message-handler.c
@@ -131,6 +131,10 @@ int pa_message_handler_send_message(pa_core *c, const char *object_path, const c
     if (message_parameters) {
         parameters = pa_json_parse(message_parameters);
 
+<<<<<<< HEAD
+        if (!parameters)
+            return -PA_ERR_INVALID;
+=======
         if (!parameters) {
             char *wrapped_message_parameters;
 
@@ -151,6 +155,7 @@ int pa_message_handler_send_message(pa_core *c, const char *object_path, const c
                 return -PA_ERR_INVALID;
             }
         }
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     }
 
     /* The handler is expected to return an error code and may also
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index 1330ef5ef..25b744074 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -54,6 +54,10 @@ static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_applicati
 static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+<<<<<<< HEAD
+static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 static Display *_gdk_display PA_GCC_WEAKREF(gdk_display);
 #endif
 #endif
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 4380087ca..11e56b3a2 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -2061,6 +2061,8 @@ static void set_preferred_sink(pa_sink_input *i, const char *sink_name) {
     pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_PREFERRED_SINK_CHANGED], i);
 }
 
+<<<<<<< HEAD
+=======
 /* Restores the render memblockq from the history memblockq during a move.
  * Called from main context while the sink input is detached. */
 static void restore_render_memblockq(pa_sink_input *i) {
@@ -2144,6 +2146,7 @@ static void restore_render_memblockq(pa_sink_input *i) {
     i->thread_info.dont_rewrite = true;
 }
 
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 /* Called from main context */
 int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, bool save) {
     struct volume_factor_entry *v;
diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c
index 4ede0439e..b19a79a92 100644
--- a/src/pulsecore/socket-util.c
+++ b/src/pulsecore/socket-util.c
@@ -218,6 +218,89 @@ int pa_socket_set_sndbuf(int fd, size_t l) {
     return 0;
 }
 
+<<<<<<< HEAD
+#ifdef HAVE_SYS_UN_H
+
+int pa_unix_socket_is_stale(const char *fn) {
+    struct sockaddr_un sa;
+    int fd = -1, ret = -1;
+
+    pa_assert(fn);
+
+    if ((fd = pa_socket_cloexec(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+        pa_log("socket(): %s", pa_cstrerror(errno));
+        goto finish;
+    }
+
+    sa.sun_family = AF_UNIX;
+    strncpy(sa.sun_path, fn, sizeof(sa.sun_path)-1);
+    sa.sun_path[sizeof(sa.sun_path) - 1] = 0;
+
+    if (connect(fd, (struct sockaddr*) &sa, sizeof(sa)) < 0) {
+#if !defined(OS_IS_WIN32)
+        if (errno == ECONNREFUSED)
+            ret = 1;
+#else
+        if (WSAGetLastError() == WSAECONNREFUSED || WSAGetLastError() == WSAEINVAL)
+            ret = 1;
+#endif
+    } else
+        ret = 0;
+
+finish:
+    if (fd >= 0)
+        pa_close(fd);
+
+    return ret;
+}
+
+int pa_unix_socket_remove_stale(const char *fn) {
+    int r;
+
+    pa_assert(fn);
+
+#ifdef HAVE_SYSTEMD_DAEMON
+    {
+        int n = sd_listen_fds(0);
+        if (n > 0) {
+            for (int i = 0; i < n; ++i) {
+                if (sd_is_socket_unix(SD_LISTEN_FDS_START + i, SOCK_STREAM, 1, fn, 0) > 0) {
+                    /* This is a socket activated socket, therefore do not consider
+                    * it stale. */
+                    return 0;
+                }
+            }
+        }
+    }
+#endif
+
+    if ((r = pa_unix_socket_is_stale(fn)) < 0)
+        return errno != ENOENT ? -1 : 0;
+
+    if (!r)
+        return 0;
+
+    /* Yes, here is a race condition. But who cares? */
+    if (unlink(fn) < 0)
+        return -1;
+
+    return 0;
+}
+
+#else /* HAVE_SYS_UN_H */
+
+int pa_unix_socket_is_stale(const char *fn) {
+    return -1;
+}
+
+int pa_unix_socket_remove_stale(const char *fn) {
+    return -1;
+}
+
+#endif /* HAVE_SYS_UN_H */
+
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 bool pa_socket_address_is_local(const struct sockaddr *sa) {
     pa_assert(sa);
 
diff --git a/src/tests/meson.build b/src/tests/meson.build
index bbdd23130..86869048f 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -8,6 +8,97 @@
 # Default tests
 
 default_tests = []
+<<<<<<< HEAD
+
+default_tests += [
+  [ 'channelmap-test', 'channelmap-test.c',
+    [ check_dep, libpulse_dep ] ],
+  [ 'core-util-test', 'core-util-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'get-binary-name-test', 'get-binary-name-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'hashmap-test', 'hashmap-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'json-test', 'json-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'mainloop-test', 'mainloop-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'proplist-test', 'proplist-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'thread-mainloop-test', 'thread-mainloop-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'utf8-test', 'utf8-test.c',
+    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+  [ 'volume-test', 'volume-test.c',
+    [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep ] ],
+]
+
+if get_option('daemon')
+  default_tests += [
+    [ 'asyncmsgq-test', 'asyncmsgq-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'asyncq-test', 'asyncq-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'close-test', 'close-test.c',
+      [            libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'cpu-mix-test', [ 'cpu-mix-test.c', 'runtime-test-util.h' ],
+      [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'cpu-remap-test', [ 'cpu-remap-test.c', 'runtime-test-util.h' ],
+      [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'cpu-sconv-test', [ 'cpu-sconv-test.c', 'runtime-test-util.h' ],
+      [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'cpu-volume-test', [ 'cpu-volume-test.c', 'runtime-test-util.h' ],
+      [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'format-test', 'format-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'hook-list-test', 'hook-list-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'lfe-filter-test', 'lfe-filter-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'lock-autospawn-test', 'lock-autospawn-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'memblock-test', 'memblock-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'memblockq-test', 'memblockq-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'mix-test', 'mix-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'mult-s16-test', [ 'mult-s16-test.c', 'runtime-test-util.h' ],
+      [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'proplist-modargs-test', 'proplist-modargs-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'queue-test', 'queue-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'resampler-test', 'resampler-test.c',
+      [            libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep ] ],
+    [ 'rtpoll-test', 'rtpoll-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'smoother-test', 'smoother-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'strlist-test', 'strlist-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'thread-test', 'thread-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+  ]
+
+  if host_machine.system() != 'windows'
+    default_tests += [
+      [ 'sigbus-test', 'sigbus-test.c',
+        [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+      [ 'usergroup-test', 'usergroup-test.c',
+        [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    ]
+  endif
+
+  if host_machine.system() != 'darwin'
+    default_tests += [
+      [ 'once-test', 'once-test.c',
+        [ check_dep, thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep ] ],
+    ]
+  endif
+
+endif
+=======
 
 if get_option('client')
   default_tests += [
@@ -30,12 +121,21 @@ if get_option('client')
     [ 'volume-test', 'volume-test.c',
       [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep ] ],
   ]
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
   default_tests += [
     [ 'mainloop-test', 'mainloop-test.c',
       [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
   ]
 
+<<<<<<< HEAD
+if get_option('daemon')
+  if alsa_dep.found()
+    default_tests += [
+      [ 'alsa-mixer-path-test', 'alsa-mixer-path-test.c',
+        [ alsa_dep, check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ],
+        libalsa_util ]
+=======
   if cc.has_header('sys/eventfd.h')
     default_tests += [
       [ 'srbchannel-test', 'srbchannel-test.c',
@@ -48,6 +148,7 @@ if get_option('client')
       [ 'mainloop-test-glib', 'mainloop-test.c',
         [ check_dep, glib_dep, libpulse_dep, libpulsecommon_dep, libpulse_mainloop_glib_dep ],
         [], ['-DGLIB_MAIN_LOOP'] ]
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     ]
   endif
 endif
@@ -102,6 +203,68 @@ if get_option('daemon')
       [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
   ]
 
+<<<<<<< HEAD
+# No-run tests
+norun_tests = []
+
+norun_tests += [
+  [ 'pacat-simple', 'pacat-simple.c',
+    [ libpulse_dep, libpulse_simple_dep ] ],
+  [ 'parec-simple', 'parec-simple.c',
+    [ libpulse_dep, libpulse_simple_dep ] ],
+]
+
+if get_option('daemon')
+  norun_tests += [
+    [ 'flist-test', 'flist-test.c',
+      [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'ipacl-test', 'ipacl-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'lo-latency-test', [ 'lo-latency-test.c', 'lo-test-util.c', 'lo-test-util.h' ],
+      [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'mcalign-test', 'mcalign-test.c',
+      [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'remix-test', 'remix-test.c',
+      [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'rtstutter', 'rtstutter.c',
+      [ thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'sig2str-test', 'sig2str-test.c',
+      [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+    [ 'stripnul', 'stripnul.c',
+      [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+  ]
+
+  # echo-cancel test is a bit tedious to handle
+  echo_cancel_test_sources = []
+  foreach s : module_echo_cancel_sources
+    echo_cancel_test_sources += '../modules/' + s
+  endforeach
+  echo_cancel_test_sources += module_echo_cancel_orc_sources
+
+  norun_tests += [
+    [ 'echo-cancel-test', echo_cancel_test_sources,
+      module_echo_cancel_deps + [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep ],
+      module_echo_cancel_libs,
+      module_echo_cancel_flags + server_c_args + [ '-DPA_MODULE_NAME=module_echo_cancel', '-DECHO_CANCEL_TEST=1' ] ]
+  ]
+
+  if cc.has_header_symbol('signal.h', 'SIGXCPU')
+    norun_tests += [
+      [ 'cpulimit-test', [ 'cpulimit-test.c', '../daemon/cpulimit.c', '../daemon/cpulimit.h' ],
+        [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+      [ 'cpulimit-test2', [ 'cpulimit-test.c', '../daemon/cpulimit.c', '../daemon/cpulimit.h' ],
+        [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ],
+        [], ['-DTEST2'] ],
+    ]
+  endif
+
+endif
+
+if cc.has_function('pthread_setaffinity_np', dependencies : thread_dep)
+  norun_tests += [
+    [ 'atomic-test', 'atomic-test.c',
+      [ check_dep, libpulsecommon_dep, thread_dep ] ]
+=======
   if host_machine.system() != 'windows'
     default_tests += [
       [ 'sigbus-test', 'sigbus-test.c',
@@ -136,6 +299,7 @@ if get_option('client')
       [ libpulse_dep, libpulse_simple_dep ] ],
     [ 'parec-simple', 'parec-simple.c',
       [ libpulse_dep, libpulse_simple_dep ] ],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   ]
 
   if gtk_dep.found() and glib_dep.found()
@@ -148,6 +312,9 @@ endif
 
 if get_option('daemon')
   norun_tests += [
+<<<<<<< HEAD
+    [ 'alsa-time-test', 'alsa-time-test.c', [ alsa_dep, thread_dep ] ]
+=======
     [ 'flist-test', 'flist-test.c',
       [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
     [ 'ipacl-test', 'ipacl-test.c',
@@ -164,6 +331,7 @@ if get_option('daemon')
       [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
     [ 'stripnul', 'stripnul.c',
       [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   ]
 
   # echo-cancel test is a bit tedious to handle
@@ -239,8 +407,11 @@ if get_option('daemon')
   daemon_tests = [
     [ 'extended-test', 'extended-test.c',
       [ check_dep, libm_dep, libpulse_dep ] ],
+<<<<<<< HEAD
+=======
     [ 'passthrough-test', 'passthrough-test.c',
       [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     [ 'sync-playback', 'sync-playback.c',
       [ check_dep, libm_dep, libpulse_dep ] ],
   ]
diff --git a/src/utils/meson.build b/src/utils/meson.build
index 8496d0bc5..421761da7 100644
--- a/src/utils/meson.build
+++ b/src/utils/meson.build
@@ -1,6 +1,88 @@
+<<<<<<< HEAD
+pacat_sources = [
+  'pacat.c',
+]
+
+pacat_aliases = [
+  'pamon',
+  'paplay',
+  'parec',
+  'parecord',
+]
+
+executable('pacat',
+  pacat_sources,
+  install: true,
+  install_rpath : privlibdir,
+  include_directories : [configinc, topinc],
+  link_with : [libpulsecommon, libpulse],
+  dependencies : [sndfile_dep, libintl_dep],
+  c_args : pa_c_args,
+)
+
+# Windows doesn't support symbolic links.
+if host_machine.system() != 'windows'
+  foreach alias : pacat_aliases
+    dst = join_paths(bindir, alias)
+    cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pacat', dst)
+    meson.add_install_script('sh', '-c', cmd)
+  endforeach
+endif
+
+pactl_sources = [
+  'pactl.c',
+]
+
+executable('pactl',
+  pactl_sources,
+  install: true,
+  install_rpath : privlibdir,
+  include_directories : [configinc, topinc],
+  link_with : [libpulsecommon, libpulse],
+  dependencies : [sndfile_dep, libintl_dep],
+  c_args : pa_c_args,
+)
+
+if get_option('daemon')
+  if host_machine.system() != 'windows'
+    pasuspender_sources = [
+      'pasuspender.c',
+    ]
+
+    executable('pasuspender',
+      pasuspender_sources,
+      install: true,
+      install_rpath : privlibdir,
+      include_directories : [configinc, topinc],
+      link_with : [libpulsecommon, libpulse],
+      dependencies: [libintl_dep],
+      c_args : pa_c_args,
+    )
+
+    pacmd_sources = [
+      'pacmd.c',
+    ]
+
+    executable('pacmd',
+      pacmd_sources,
+      install: true,
+      install_rpath : privlibdir,
+      include_directories : [configinc, topinc],
+      link_with : [libpulsecommon, libpulse],
+      dependencies: [libintl_dep],
+      c_args : pa_c_args,
+    )
+  endif
+endif
+
+if x11_dep.found()
+  pax11publish_sources = [
+    'pax11publish.c',
+=======
 if get_option('client')
   pacat_sources = [
     'pacat.c',
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   ]
 
   pacat_aliases = [
@@ -20,6 +102,11 @@ if get_option('client')
     c_args : pa_c_args,
   )
 
+<<<<<<< HEAD
+if cdata.has('HAVE_OSS_WRAPPER')
+  libpulsecommon_sources = [
+    'padsp.c',
+=======
   # Windows doesn't support symbolic links.
   if host_machine.system() != 'windows'
     foreach alias : pacat_aliases
@@ -31,6 +118,7 @@ if get_option('client')
 
   pactl_sources = [
     'pactl.c',
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
   ]
 
   executable('pactl',
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index d3736bc48..04181e80e 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -210,6 +210,7 @@ static void stat_callback(pa_context *c, const pa_stat_info *i, void *userdata)
         pa_bytes_snprint(s, sizeof(s), i->scache_size);
         printf(_("Sample cache size: %s\n"), s);
     }
+<<<<<<< HEAD
 
     complete_action();
 }
@@ -233,6 +234,31 @@ static void get_default_source(pa_context *c, const pa_server_info *i, void *use
         return;
     }
 
+=======
+
+    complete_action();
+}
+
+static void get_default_sink(pa_context *c, const pa_server_info *i, void *userdata) {
+    if (!i) {
+        pa_log(_("Failed to get server information: %s"), pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    printf(_("%s\n"), i->default_sink_name);
+
+    complete_action();
+}
+
+static void get_default_source(pa_context *c, const pa_server_info *i, void *userdata) {
+    if (!i) {
+        pa_log(_("Failed to get server information: %s"), pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     printf(_("%s\n"), i->default_source_name);
 
     complete_action();
@@ -1913,6 +1939,24 @@ static void get_source_mute_callback(pa_context *c, const pa_source_info *i, int
     complete_action();
 }
 
+static void get_source_mute_callback(pa_context *c, const pa_source_info *i, int is_last, void *userdata) {
+    if (is_last < 0) {
+        pa_log(_("Failed to get source information: %s"), pa_strerror(pa_context_errno(c)));
+        quit(1);
+        return;
+    }
+
+    if (is_last)
+        return;
+
+    pa_assert(i);
+
+    printf(("Mute: %s\n"),
+           pa_yes_no_localised(i->mute));
+
+    complete_action();
+}
+
 static void get_source_volume_callback(pa_context *c, const pa_source_info *i, int is_last, void *userdata) {
     if (is_last < 0) {
         pa_log(_("Failed to get source information: %s"), pa_strerror(pa_context_errno(c)));
@@ -2214,7 +2258,11 @@ static void context_subscribe_callback(pa_context *c, pa_subscription_event_type
         pa_json_encoder_end_object(encoder);
 
         char* json_str = pa_json_encoder_to_string_free(encoder);
+<<<<<<< HEAD
+        printf("%s", json_str);
+=======
         printf("%s\n", json_str);
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
         pa_xfree(json_str);
     } else {
         printf(_("Event '%s' on %s #%u\n"),
@@ -2760,7 +2808,10 @@ int main(int argc, char *argv[]) {
         format = TEXT;
     } else if (pa_streq(opt_format, "json")) {
         format = JSON;
+<<<<<<< HEAD
+=======
         setlocale(LC_NUMERIC, "C");
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     } else {
         pa_log(_("Invalid format value '%s'"), opt_format);
         goto quit;