diff --git a/.gitignore b/.gitignore
index d86eed290..331d4888d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ stamp-*
.dirstamp
*.orig
*.rej
+subprojects/*/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b6dc11ca..4f999607f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
# container and push it to the project's container registry on fd.o GitLab.
# This step is only run when the tag for the container changes, else it is
# effectively a no-op. All of this infrastructure is inherited from the
-# wayland/ci-templates repository which is the recommended way to set up CI
+# freedesktop/ci-templates repository which is the recommended way to set up CI
# infrastructure on fd.o GitLab.
#
# Once the container stage is done, we move on to the 'build' stage where we
@@ -19,22 +19,26 @@ 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'
- UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
include:
# We pull templates from master to avoid the overhead of periodically
# scanning for changes upstream. This does means builds might occasionally
# break due to upstream changing things, so if you see unexpected build
# failures, this might be one cause.
- - project: 'wayland/ci-templates'
+ - project: 'freedesktop/ci-templates'
ref: 'master'
file: '/templates/ubuntu.yml'
build-container:
- extends: .fdo.container-ifnot-exists@ubuntu
+ extends: .fdo.container-build@ubuntu
stage: container
variables:
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
@@ -48,6 +52,7 @@ build-container:
check
curl
dbus-x11
+ doxygen
g++
gcc
gettext
@@ -88,17 +93,17 @@ build-container:
wget
build-meson:
+ extends: .fdo.distribution-image@ubuntu
stage: build
- image: $UBUNTU_IMAGE
script:
- # Install meson
- - wget -q https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz
- - tar -xf meson-0.50.0.tar.gz
- - cd meson-0.50.0
+ # Install meson (higher than our min version to support our wrap file)
+ - wget -q https://github.com/mesonbuild/meson/releases/download/0.63.2/meson-0.63.2.tar.gz
+ - tar -xf meson-0.63.2.tar.gz
+ - cd meson-0.63.2
- python3 setup.py install
- cd ..
# Do the actual build
- - meson build
+ - meson build -Dwebrtc-aec=enabled
- cd build
- ninja
- ulimit -c 0 # don't dump core files on tests that are supposed to assert
diff --git a/NEWS b/NEWS
index 898ac0cc9..06e3432e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,192 @@
+<<<<<<< HEAD
+=======
+PulseAudio 17.0
+
+Changes at a glance:
+ * Notes for end users
+ * Updates to ALSA UCM-based setups
+ * Battery level indication to Bluetooth devices
+ * Support for the Bluetooth FastStream codec
+ * webrtc-audio-processing dependency updated
+ * Trigger role groups added to module-role-cork
+ * XDG base directory spec for profile-set loading
+ * Notes for application developers
+ * PA_RATE_MAX increased
+ * Notes for packagers
+ * webrtc-audio-processing dependency updated
+
+Contributors
+
+Alistair Leslie-Hughes
+Alper Nebi Yasak
+Arun Raghavan
+Asier Sarasua Garmendia
+Ataberk Özen
+Balázs Meskó
+Biswapriyo Nath
+Dylan Van Assche
+Eero Nurkkala
+Ettore Atalan
+Fabrice Fontaine
+Fran Diéguez
+Georg Chini
+Gioele Barabucci
+Gogo Gogsi
+Hector Martin
+Hugo Carvalho
+Hui Wang
+Igor V. Kovalenko
+Jaechul Lee
+Jan Kuparinen
+Jan Palus
+Jaroslav Kysela
+Jiri Grönroos
+Joachim Philipp
+Jordi Mas
+Marijn Suijten
+Mart Raudsepp
+Nicolas Cavallari
+Peter Meerwald-Stadler
+Philip Goto
+Rosen Penev
+Rudi Heitbaum
+Sabri Ünal
+Sean Greenslade
+Seong-ho Cho
+Shunsuke Shimizu
+SimonP
+Takashi Sakamoto
+Tanu Kaskinen
+Temuri Doghonadze
+Toni Estevez
+Weijia Wang
+Wim Taymans
+Yureka
+acheronfail
+flyingOwl
+grimst
+hashitaku
+mooo
+peijiankang
+redfast00
+wael
+김인수
+
+
+PulseAudio 16.1
+
+A bug fix release.
+
+ * Fix parsing of percentage volumes with decimal points in pactl
+ * Fix crash with the "pacmd play-file" command when reads from the disk aren't frame-aligned
+ * Fix module-rtp-recv sometimes thinking it's receiving an Opus stream when it's not
+ * Fix frequent crashing in module-combine-sink, regression in 16.0
+ * Fix crashing on 32-bit architectures when using the GStreamer codecs for LDAC and AptX
+
+Contributors
+
+Georg Chini
+Igor V. Kovalenko
+Jaechul Lee
+Jan Palus
+Sean Greenslade
+
+
+PulseAudio 16.0
+
+Changes at a glance:
+ * Notes for end users
+ * Opus support in RTP modules
+ * Improved hardware support
+ * EPOS/Sennheiser GSP 670 USB/wireless headset
+ * SteelSeries GameDAC
+ * Behringer UMC22 generalized to Texas Instruments PCM2902 to support more products
+ * NI Komplete Audio 6 MK2 profiles
+ * Tunnel latency is now configurable
+ * Bluetooth device battery level reporting added
+ * Tunnel and combine-sunk latency fixes
+ * patcl can show information in JSON format
+ * Channel remixing can be disabled for module-combine-sink
+ * A lot of fixes to ALSA, bluetooth, and other components.
+ * Notes for application developers
+ * Stream latency reports now include resampler delay
+ * Module installation location changed, remember to upgrade paprefs to the latest version!
+ * Notes for packagers
+ * Opus support in the RTP modules requires enabling GStreamer
+ * Bluetooth battery level reporting via BlueZ requires enabling experimentals features in BlueZ
+ * New time smoother implementation
+ * Change Meson option 'daemon-only' to 'client'
+ * glib and fftw are now common dependencies, not only for the client.
+ * Enable GStreamer-based RTP by default when available
+
+Detailed change log:
+
+ https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/16.0/
+
+Contributors
+
+Alexey Rubtsov
+Anders Jonsson
+Andika Triwidada
+Arun Raghavan
+Biswapriyo Nath
+BtbN
+Chengyi Zhao
+Chupligin Sergey
+Craig Howard
+Daniel Dantur
+Daniel Hernandez
+Diederik de Haas
+Dylan Van Assche
+Emilio Herrera
+Ettore Atalan
+Fran Diéguez
+Georg Chini
+Gogo Gogsi
+Göran Uddeborg
+Hela Basa
+Hui Wang
+Igor V. Kovalenko
+Jan Kuparinen
+Jaroslav Kysela
+Josef Haider
+João Paulo Rechi Vita
+Juho Hämäläinen
+Karl Ove Hufthammer
+Laurent Bigonville
+Luna Jernberg
+Lv Genggeng
+Marijn Suijten
+Mart Raudsepp
+Mathy Vanvoorden
+Olivier Gayot
+Ovari
+Oğuz Ersen
+Piotr Drąg
+Rafael Fontenelle
+Rico Tzschichholz
+Sanchayan Maity
+Sebastian Reichel
+Sergey A
+Sibo Dong
+Sungjoon Moon
+Takashi Sakamoto
+Takuro Onoue
+Tanu Kaskinen
+Temuri Doghonadze
+Will Thompson
+Yuri Chornoivan
+acheronfail
+baek inchan
+guest271314
+liaohanqin
+simmon
+simple
+tensorknower69
+김인수
+
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
PulseAudio 15.0
Changes at a glance:
diff --git a/man/meson.build b/man/meson.build
index 31c581a8f..906be3a7f 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -14,11 +14,33 @@ 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']],
+ ['pactl', '1'],
+ ['pulse-client.conf', '5'],
+ ]
+
+ if cdata.has('HAVE_OSS_WRAPPER')
+ manpages += [
+ ['padsp', '1'],
+ ]
+ endif
+
+ if x11_dep.found()
+ manpages += [
+ ['pax11publish', '1'],
+ ]
+ endif
+endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
if cdata.has('HAVE_OSS_WRAPPER')
manpages += [
diff --git a/man/pacat.1.xml.in b/man/pacat.1.xml.in
index 72fc0ad31..387f3ed4e 100644
--- a/man/pacat.1.xml.in
+++ b/man/pacat.1.xml.in
@@ -79,7 +79,7 @@ License along with PulseAudio; if not, see .
diff --git a/meson.build b/meson.build
index 944dcbb89..e7f1664a5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,16 @@
-project('pulseaudio', 'c', 'cpp',
- version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(),
+project('pulseaudio', 'c',
+ version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check : false).stdout().strip(),
meson_version : '>= 0.50.0',
- default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
+ 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
@@ -25,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
@@ -53,6 +63,8 @@ libpulse_mainloop_glib_version = '@0@.@1@.@2@'.format(
libpulse_mainloop_glib_version_info[1],
)
+i18n = import('i18n')
+
# Paths
prefix = get_option('prefix')
@@ -68,6 +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
@@ -85,7 +101,12 @@ pulsesysconfdir = join_paths(sysconfdir, 'pulse')
modlibexecdir = get_option('modlibexecdir')
if modlibexecdir == ''
- modlibexecdir = join_paths(libdir, 'pulse-' + pa_version_major_minor, 'modules')
+ modlibexecdir = join_paths(libdir, 'pulseaudio', 'modules')
+endif
+
+if host_machine.system() == 'windows'
+ # Windows only supports loading libraries from the same dir as the executable
+ modlibexecdir = bindir
endif
padsplibdir = get_option('padsplibdir')
@@ -140,7 +161,11 @@ cdata.set_quoted('PA_MACHINE_ID', join_paths(sysconfdir, 'machine-id'))
cdata.set_quoted('PA_MACHINE_ID_FALLBACK', join_paths(localstatedir, 'lib', 'dbus', 'machine-id'))
cdata.set_quoted('PA_SRCDIR', join_paths(meson.current_source_dir(), 'src'))
cdata.set_quoted('PA_BUILDDIR', meson.current_build_dir())
-cdata.set_quoted('PA_SOEXT', '.so')
+if host_machine.system() == 'windows'
+ cdata.set_quoted('PA_SOEXT', '.dll')
+else
+ cdata.set_quoted('PA_SOEXT', '.so')
+endif
cdata.set_quoted('PA_DEFAULT_CONFIG_DIR', pulsesysconfdir)
cdata.set('PA_DEFAULT_CONFIG_DIR_UNQUOTED', pulsesysconfdir)
cdata.set_quoted('PA_BINARY', join_paths(bindir, 'pulseaudio'))
@@ -152,8 +177,7 @@ cdata.set_quoted('PA_SYSTEM_USER', get_option('system_user'))
cdata.set_quoted('PA_SYSTEM_GROUP', get_option('system_group'))
cdata.set_quoted('PA_ACCESS_GROUP', get_option('access_group'))
cdata.set_quoted('PA_CFLAGS', 'Not yet supported on meson')
-cdata.set_quoted('PA_ALSA_PATHS_DIR', join_paths(alsadatadir, 'paths'))
-cdata.set_quoted('PA_ALSA_PROFILE_SETS_DIR', join_paths(alsadatadir, 'profile-sets'))
+cdata.set_quoted('PA_ALSA_DATA_DIR', alsadatadir)
cdata.set_quoted('DESKTOPFILEDIR', join_paths(datadir, 'applications'))
cdata.set_quoted('PULSE_LOCALEDIR', localedir)
cdata.set_quoted('GETTEXT_PACKAGE', 'pulseaudio')
@@ -177,6 +201,7 @@ endif
# rather than ending up in the config.h file?
if host_machine.system() == 'darwin'
cdata.set('OS_IS_DARWIN', 1)
+ cdata.set('HAVE_COREAUDIO', 1)
cdata.set('_DARWIN_C_SOURCE', '200112L') # Needed to get NSIG on Mac OS
elif host_machine.system() == 'windows'
cdata.set('OS_IS_WIN32', 1)
@@ -416,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 = []
@@ -425,6 +454,7 @@ endif
# Code coverage
if get_option('gcov')
+ add_languages('cpp')
add_project_arguments('--coverage', language: ['c', 'cpp'])
add_project_link_arguments('--coverage', language: ['c', 'cpp'])
endif
@@ -490,22 +520,24 @@ endif
need_libatomic_ops = false
-atomictest = '''void func() {
+atomictest = '''int main() {
volatile int atomic = 2;
__sync_bool_compare_and_swap (&atomic, 2, 3);
+ return 0;
}
'''
-if cc.compiles(atomictest)
+if cc.links(atomictest)
cdata.set('HAVE_ATOMIC_BUILTINS', 1)
- newatomictest = '''void func() {
+ newatomictest = '''int main() {
int c = 0;
__atomic_store_n(&c, 4, __ATOMIC_SEQ_CST);
+ return 0;
}
'''
- if(cc.compiles(newatomictest))
+ if(cc.links(newatomictest))
cdata.set('HAVE_ATOMIC_BUILTINS_MEMORY_MODEL', 1)
endif
@@ -577,6 +609,7 @@ 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)
@@ -593,39 +626,20 @@ elif get_option('database') == 'gdbm'
else
database_dep = dependency('', required: false)
endif
+=======
+# Dependencies common to client, daemon and modules
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
if get_option('ipv6')
cdata.set('HAVE_IPV6', 1)
endif
-if get_option('legacy-database-entry-format')
- cdata.set('ENABLE_LEGACY_DATABASE_ENTRY_FORMAT', 1)
-endif
-
-if get_option('stream-restore-clear-old-devices')
- cdata.set('STREAM_RESTORE_CLEAR_OLD_DEVICES', 1)
-endif
-
-if get_option('running-from-build-tree')
- cdata.set('HAVE_RUNNING_FROM_BUILD_TREE', 1)
-endif
-
-alsa_dep = dependency('alsa', version : '>= 1.0.24', required : get_option('alsa'))
-if alsa_dep.found()
- cdata.set('HAVE_ALSA', 1)
- cdata.set('HAVE_ALSA_UCM', 1)
-endif
-
-asyncns_dep = dependency('libasyncns', version : '>= 0.1', required : get_option('asyncns'))
-if asyncns_dep.found()
- cdata.set('HAVE_LIBASYNCNS', 1)
-endif
-
dbus_dep = dependency('dbus-1', version : '>= 1.4.12', required : get_option('dbus'))
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)')
@@ -634,51 +648,22 @@ 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)
-endif
-
-gtk_dep = dependency('gtk+-3.0', required : get_option('gtk'))
-if gtk_dep.found()
- cdata.set('HAVE_GTK', 1)
-endif
-
-have_orcc = false
-orcc_args = []
-orc_dep = dependency('orc-0.4', version : '>= 0.4.11', required : get_option('orc'))
-orcc = find_program('orcc', required : get_option('orc'))
-if orc_dep.found() and orcc.found()
- have_orcc = true
- orcc_args = [orcc]
- #orcc_args = [orcc, '--include', 'glib.h']
- cdata.set('HAVE_ORC', 1)
-else
- cdata.set('DISABLE_ORC', 1)
-endif
-
-samplerate_dep = dependency('samplerate', version : '>= 0.1.0', required : get_option('samplerate'))
-if samplerate_dep.found()
- cdata.set('HAVE_LIBSAMPLERATE', 1)
+ cdata.set('HAVE_GLIB20', 1) # to match the AM_CONDITIONAL for CMake file generation
endif
sndfile_dep = dependency('sndfile', version : '>= 1.0.20')
-soxr_dep = dependency('soxr', version : '>= 0.1.1', required : get_option('soxr'))
-if soxr_dep.found()
- cdata.set('HAVE_SOXR', 1)
-endif
-
libsystemd_dep = dependency('libsystemd', required : get_option('systemd'))
if libsystemd_dep.found()
cdata.set('HAVE_SYSTEMD_DAEMON', 1)
cdata.set('HAVE_SYSTEMD_LOGIN', 1)
cdata.set('HAVE_SYSTEMD_JOURNAL', 1)
endif
-systemd_dep = dependency('systemd', required : get_option('systemd'))
-if systemd_dep.found() and systemduserunitdir == ''
- systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-endif
libelogind_dep = dependency('libelogind', required : get_option('elogind'))
if libelogind_dep.found()
@@ -691,6 +676,7 @@ if cc.has_header('tcpd.h') and cc.has_function('hosts_access', dependencies : tc
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'))
@@ -704,15 +690,24 @@ 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)
cdata.set('PULSEDSP_LOCATION', pulsedsp_location)
endif
-if get_option('hal-compat')
- cdata.set('HAVE_HAL_COMPAT', 1)
+fftw_dep = dependency('fftw3f', required : get_option('fftw'))
+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)
@@ -732,47 +727,179 @@ if bluez_dep.found()
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
- if get_option('bluez5-ofono-headset')
- cdata.set('HAVE_BLUEZ_5_OFONO_HEADSET', 1)
+
+ gtk_dep = dependency('gtk+-3.0', required : get_option('gtk'))
+ if gtk_dep.found()
+ cdata.set('HAVE_GTK', 1)
endif
endif
-fftw_dep = dependency('fftw3f', required : get_option('fftw'))
-if fftw_dep.found()
- cdata.set('HAVE_FFTW', 1)
-endif
+# Daemon and module dependencies
-jack_dep = dependency('jack', version : '>= 0.117.0', required : get_option('jack'))
-if jack_dep.found()
- cdata.set('HAVE_JACK', 1)
-endif
+if get_option('daemon')
+ # FIXME: make sure it's >= 2.2
+ ltdl_dep = cc.find_library('ltdl', required : true)
-lirc_dep = dependency('lirc', required : get_option('lirc'))
-if lirc_dep.found()
- cdata.set('HAVE_LIRC', 1)
-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)
-openssl_dep = dependency('openssl', version : '>= 0.9', required : get_option('openssl'))
-if openssl_dep.found()
- cdata.set('HAVE_OPENSSL', 1)
-endif
+ 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
-speex_dep = dependency('speexdsp', version : '>= 1.2', required : get_option('speex'))
-if speex_dep.found()
- cdata.set('HAVE_SPEEX', 1)
-endif
+ if get_option('legacy-database-entry-format')
+ cdata.set('ENABLE_LEGACY_DATABASE_ENTRY_FORMAT', 1)
+ endif
-udev_dep = dependency('libudev', version : '>= 143', required : get_option('udev'))
-if udev_dep.found()
- cdata.set('HAVE_UDEV', 1)
-endif
+ if get_option('stream-restore-clear-old-devices')
+ cdata.set('STREAM_RESTORE_CLEAR_OLD_DEVICES', 1)
+ endif
-webrtc_dep = dependency('webrtc-audio-processing', version : '>= 0.2', required : get_option('webrtc-aec'))
-if webrtc_dep.found()
- cdata.set('HAVE_WEBRTC', 1)
-endif
+ if get_option('running-from-build-tree')
+ cdata.set('HAVE_RUNNING_FROM_BUILD_TREE', 1)
+ endif
+ if get_option('enable-smoother-2')
+ cdata.set('USE_SMOOTHER_2', 1)
+ endif
+
+ alsa_dep = dependency('alsa', version : '>= 1.0.24', required : get_option('alsa'))
+ if alsa_dep.found()
+ cdata.set('HAVE_ALSA', 1)
+ cdata.set('HAVE_ALSA_UCM', 1)
+ endif
+
+ gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : false)
+ 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
+
+ have_orcc = false
+ orcc_args = []
+ orc_dep = dependency('orc-0.4', version : '>= 0.4.11', required : get_option('orc'))
+ orcc = find_program('orcc', required : get_option('orc'))
+ if orc_dep.found() and orcc.found()
+ have_orcc = true
+ orcc_args = [orcc]
+ #orcc_args = [orcc, '--include', 'glib.h']
+ cdata.set('HAVE_ORC', 1)
+ else
+ cdata.set('DISABLE_ORC', 1)
+ endif
+
+ samplerate_dep = dependency('samplerate', version : '>= 0.1.0', required : get_option('samplerate'))
+ if samplerate_dep.found()
+ cdata.set('HAVE_LIBSAMPLERATE', 1)
+ endif
+
+ speex_dep = dependency('speexdsp', version : '>= 1.2', required : get_option('speex'))
+ if speex_dep.found()
+ cdata.set('HAVE_SPEEX', 1)
+ endif
+
+ soxr_dep = dependency('soxr', version : '>= 0.1.1', required : get_option('soxr'))
+ if soxr_dep.found()
+ cdata.set('HAVE_SOXR', 1)
+ endif
+
+ webrtc_dep = dependency('webrtc-audio-processing-1', version : '>= 1.0', required : get_option('webrtc-aec'))
+ if webrtc_dep.found()
+ cdata.set('HAVE_WEBRTC', 1)
+ endif
+
+ systemd_dep = dependency('systemd', required : get_option('systemd'))
+ if systemd_dep.found() and systemduserunitdir == ''
+ systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
+ endif
+
+ libelogind_dep = dependency('libelogind', required : get_option('elogind'))
+ if libelogind_dep.found()
+ cdata.set('HAVE_SYSTEMD_LOGIN', 1)
+ endif
+
+ if get_option('consolekit').enabled()
+ assert(dbus_dep.found(), 'ConsoleKit requires D-Bus support')
+ 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
+
+ if x11_dep.found()
+ xcb_dep = dependency('xcb', required : true, version : '>= 1.6')
+ ice_dep = dependency('ice', required : true)
+ sm_dep = dependency('sm', required : true)
+ xtst_dep = dependency('xtst', required : true)
+ cdata.set('HAVE_X11', 1)
+ if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
+ cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
+ endif
+ endif
+
+ 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)
+ endif
+ if get_option('bluez5-ofono-headset')
+ cdata.set('HAVE_BLUEZ_5_OFONO_HEADSET', 1)
+ endif
+ endif
+
+ jack_dep = dependency('jack', version : '>= 0.117.0', required : get_option('jack'))
+ if jack_dep.found()
+ cdata.set('HAVE_JACK', 1)
+ endif
+
+ lirc_dep = dependency('lirc', required : get_option('lirc'))
+ if lirc_dep.found()
+ cdata.set('HAVE_LIRC', 1)
+ endif
+
+ openssl_dep = dependency('openssl', version : '>= 0.9', required : get_option('openssl'))
+ if openssl_dep.found()
+ cdata.set('HAVE_OPENSSL', 1)
+ endif
+
+ udev_dep = dependency('libudev', version : '>= 143', required : get_option('udev'))
+ if udev_dep.found()
+ 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'))
@@ -781,6 +908,30 @@ 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
+
+ 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
+ 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
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
endif
bluez5_gst_dep = dependency('gstreamer-1.0', version : '>= 1.14', required : get_option('bluez5-gstreamer'))
@@ -795,9 +946,6 @@ endif
# These are required for the CMake file generation
cdata.set('PA_LIBDIR', libdir)
cdata.set('PA_INCDIR', includedir)
-if glib_dep.found()
- cdata.set('HAVE_GLIB20', 1) # to match the AM_CONDITIONAL for CMake file generation
-endif
# Test dependencies
@@ -808,81 +956,93 @@ 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
subdir('shell-completion/bash')
subdir('shell-completion/zsh')
subdir('src')
-subdir('vala')
+if get_option('client')
+ subdir('vala')
+endif
# Now generate config.h from everything above
configure_file(output : 'config.h', configuration : cdata)
-# pkg-config files
+if get_option('client')
-pc_cdata = configuration_data()
+ # pkg-config files
-pc_cdata.set('prefix', prefix)
-pc_cdata.set('exec_prefix', prefix)
-pc_cdata.set('libdir', libdir)
-pc_cdata.set('includedir', includedir)
-pc_cdata.set('modlibexecdir', modlibexecdir)
-pc_cdata.set('PACKAGE_VERSION', pa_version_str)
-pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor)
-# FIXME: the line below is wrong. Currently the meson thread dep lacks documentation,
-# and doesn't allow introspection, ie. none of get_pkgconfig_variable() or
-# get_configtool_variable() work with it, so we have no way to get this flag right,
-# unless we do all the work ourselves. See current work in glib, also meson #553.
-pc_cdata.set('PTHREAD_LIBS', '-pthread')
+ pc_cdata = configuration_data()
-pc_files = [
- 'libpulse.pc',
- 'libpulse-simple.pc',
-]
+ pc_cdata.set('prefix', prefix)
+ pc_cdata.set('exec_prefix', prefix)
+ pc_cdata.set('libdir', libdir)
+ pc_cdata.set('includedir', includedir)
+ pc_cdata.set('modlibexecdir', modlibexecdir)
+ pc_cdata.set('PACKAGE_VERSION', pa_version_str)
+ pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor)
+ # FIXME: the line below is wrong. Currently the meson thread dep lacks documentation,
+ # and doesn't allow introspection, ie. none of get_pkgconfig_variable() or
+ # get_configtool_variable() work with it, so we have no way to get this flag right,
+ # unless we do all the work ourselves. See current work in glib, also meson #553.
+ pc_cdata.set('PTHREAD_LIBS', '-pthread')
-if glib_dep.found()
- pc_files += 'libpulse-mainloop-glib.pc'
-endif
+ pc_files = [
+ 'libpulse.pc',
+ 'libpulse-simple.pc',
+ ]
+
+ if glib_dep.found()
+ pc_files += 'libpulse-mainloop-glib.pc'
+ endif
+
+ foreach file : pc_files
+ configure_file(
+ input : file + '.in',
+ output : file,
+ configuration : pc_cdata,
+ install_dir : pkgconfigdir)
+ endforeach
+
+ # CMake files
+
+ m4 = find_program('m4', required: true)
+
+ cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
+
+ cmake_template_file = configure_file(
+ input : 'PulseAudioConfig.cmake.in',
+ output : 'PulseAudioConfig.cmake.tmp',
+ configuration: cdata,
+ )
+
+ custom_target('PulseAudioConfig.cmake',
+ input : cmake_template_file,
+ output : 'PulseAudioConfig.cmake',
+ capture : true,
+ command : [m4, '@INPUT@'],
+ build_by_default : true,
+ install : true,
+ install_dir : cmakedir,
+ )
-foreach file : pc_files
configure_file(
- input : file + '.in',
- output : file,
- configuration : pc_cdata,
- install_dir : pkgconfigdir)
-endforeach
+ input : 'PulseAudioConfigVersion.cmake.in',
+ output : 'PulseAudioConfigVersion.cmake',
+ configuration: cdata,
+ install : true,
+ install_dir : cmakedir,
+ )
-# CMake files
-
-m4 = find_program('m4', required: true)
-
-cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
-
-cmake_template_file = configure_file(
- input : 'PulseAudioConfig.cmake.in',
- output : 'PulseAudioConfig.cmake.tmp',
- configuration: cdata,
-)
-
-custom_target('PulseAudioConfig.cmake',
- input : cmake_template_file,
- output : 'PulseAudioConfig.cmake',
- capture : true,
- command : [m4, '@INPUT@'],
- build_by_default : true,
- install : true,
- install_dir : cmakedir,
-)
-
-configure_file(
- input : 'PulseAudioConfigVersion.cmake.in',
- output : 'PulseAudioConfigVersion.cmake',
- configuration: cdata,
- install : true,
- install_dir : cmakedir,
-)
+endif # client
############################################################
@@ -913,17 +1073,57 @@ 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')),
+ 'Enable X11: @0@'.format(x11_dep.found()),
+ 'Enable D-Bus: @0@'.format(dbus_dep.found()),
+ 'Enable GLib 2: @0@'.format(glib_dep.found()),
+ 'Enable systemd integration: @0@'.format(libsystemd_dep.found()),
+ 'Enable FFTW: @0@'.format(fftw_dep.found()),
+ 'Enable IPv6: @0@'.format(get_option('ipv6')),
+ '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')),
+]
+
+if get_option('client')
+summary += [
+ '',
+ '--- Pulseaudio client features ---',
+ '',
+ 'Enable Gtk+ 3: @0@'.format(gtk_dep.found()),
+ 'Enable Async DNS: @0@'.format(asyncns_dep.found()),
+ 'Enable OSS Wrapper: @0@'.format(cdata.has('HAVE_OSS_WRAPPER')),
+]
+endif
+
+if get_option('daemon')
+summary += [
+ '',
+ '--- Pulseaudio daemon features ---',
+ '',
+ '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()),
+ 'Enable LIRC: @0@'.format(lirc_dep.found()),
# '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()),
@@ -941,21 +1141,35 @@ summary = [
'Enable systemd: @0@'.format(libsystemd_dep.found()),
'Enable elogind: @0@'.format(libelogind_dep.found()),
'Enable TCP Wrappers: @0@'.format(tcpwrap_dep.found()),
- 'Enable libsamplerate: @0@'.format(samplerate_dep.found()),
- 'Enable IPv6: @0@'.format(get_option('ipv6')),
- 'Enable OpenSSL (for Airtunes): @0@'.format(openssl_dep.found()),
- 'Enable FFTW: @0@'.format(fftw_dep.found()),
- 'Enable ORC: @0@'.format(have_orcc),
+=======
+ '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')),
+ 'Enable systemd units: @0@'.format(systemd_dep.found()),
+ 'Enable elogind: @0@'.format(libelogind_dep.found()),
+ 'Enable ConsoleKit: @0@'.format(not get_option('consolekit').disabled() and dbus_dep.found()),
+ 'Enable TCP Wrappers: @0@'.format(tcpwrap_dep.found()),
+ 'Enable OpenSSL (for Airtunes): @0@'.format(openssl_dep.found()),
'Database: @0@'.format(get_option('database')),
'Legacy Database Entry Support: @0@'.format(get_option('legacy-database-entry-format')),
'module-stream-restore:',
@@ -968,19 +1182,21 @@ summary = [
# 'Force preopen: @0@'.format(${FORCE_PREOPEN}),
# 'Preopened modules: @0@'.format(${PREOPEN_MODS}),
]
+endif
message('\n '.join(summary))
# Sanity checks
-if not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec')
+if get_option('daemon') and not speex_dep.found() and not webrtc_dep.found() and not get_option('adrian-aec')
error('At least one echo canceller implementation must be available!')
endif
-if samplerate_dep.found()
+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 = [
@@ -1011,4 +1227,36 @@ if host_machine.system() != 'windows'
]
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',
+ '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 get_option('daemon') and 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 get_option('daemon') and host_machine.system() != 'windows' and 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))
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
endif
diff --git a/meson_options.txt b/meson_options.txt
index bb41a42a7..bb3b6e15a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +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')
@@ -96,6 +102,9 @@ option('bluez5-native-headset',
option('bluez5-ofono-headset',
type : 'boolean',
description : 'Optional oFono headset backend support (BlueZ 5)')
+option('consolekit',
+ type : 'feature', value : 'auto',
+ description : 'Optional ConsoleKit support')
option('dbus',
type : 'feature', value : 'auto',
description : 'Optional D-Bus support')
@@ -162,6 +171,9 @@ option('valgrind',
option('x11',
type : 'feature', value : 'auto',
description : 'Optional X11 support')
+option('enable-smoother-2',
+ type : 'boolean', value : true,
+ description : 'Use alternative time smoother implementation')
# Echo cancellation
diff --git a/po/LINGUAS b/po/LINGUAS
index 4363861a5..7732c92ca 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -48,3 +48,8 @@ zh_CN
zh_TW
eo
si
+<<<<<<< HEAD
+=======
+ka
+eu
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7a914f1d7..c92665d9b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -170,6 +170,7 @@ src/pulsecore/thread-mq.c
src/pulsecore/thread-posix.c
src/pulsecore/thread-win32.c
src/pulsecore/time-smoother.c
+src/pulsecore/time-smoother_2.c
src/pulsecore/tokenizer.c
src/pulsecore/x11prop.c
src/pulsecore/x11wrap.c
diff --git a/po/af.po b/po/af.po
index 9da2e0904..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 \n"
"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
@@ -100,7 +104,7 @@ msgstr ""
#: 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)."
+"of error, warn, notice, info, debug)."
msgstr ""
#: src/daemon/cmdline.c:277
@@ -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,7 @@ 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
@@ -925,21 +966,79 @@ 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
+msgid "Bluetooth Input"
+msgstr "Bluetooth-toevoer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Bluetooth-afvoer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Oorfone"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr "Draagbaar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Kar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "Hoëtroustel"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Foon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Hoëtrouspel (A2DP-teiken)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+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)"
@@ -988,8 +1087,8 @@ msgid ""
"this module is being loaded automatically> use_volume_sharing= "
msgstr ""
-#: 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
#, c-format
msgid "FFT based equalizer on %s"
msgstr "FFT-gebaseerde effenaar op %s"
@@ -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 ""
@@ -1288,6 +1409,7 @@ msgstr "Bo agter regs"
#: 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
+#: src/utils/pactl.c:483 src/utils/pactl.c:504
msgid "(invalid)"
msgstr "(ongeldig)"
@@ -1389,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"
@@ -1668,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 ""
@@ -1723,7 +1857,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -1802,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 ""
@@ -1873,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 ""
@@ -1907,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 ""
@@ -1915,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 ""
@@ -1928,6 +2084,7 @@ 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 ""
@@ -1943,6 +2100,23 @@ 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 ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: 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
+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 ""
@@ -1954,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 ""
@@ -1990,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 ""
@@ -1998,6 +2180,7 @@ msgstr ""
msgid "1|0"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr ""
@@ -2007,6 +2190,17 @@ 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 ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2022,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 ""
@@ -2080,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 ""
@@ -2100,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"
@@ -2126,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"
@@ -2140,6 +2370,7 @@ msgid ""
"Cookie: %04x:%04x\n"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2153,28 +2384,60 @@ msgid "not available"
msgstr ""
#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+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 ""
@@ -2196,26 +2459,66 @@ msgid "USB"
msgstr ""
#: src/utils/pactl.c:298
+=======
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+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"
@@ -2237,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"
@@ -2289,6 +2621,7 @@ 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
@@ -2298,11 +2631,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2313,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"
@@ -2328,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"
@@ -2344,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: % 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"
@@ -2404,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"
@@ -2431,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"
@@ -2453,21 +2865,34 @@ 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 ""
@@ -2477,16 +2902,35 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2497,11 +2941,16 @@ 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 ""
@@ -2559,10 +3008,70 @@ msgid "card"
msgstr ""
#: src/utils/pactl.c:1427
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr ""
+
+#: 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 ""
@@ -2628,6 +3137,73 @@ msgid "#N FORMATS"
msgstr ""
#: src/utils/pactl.c:1865
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -2635,20 +3211,30 @@ 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"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\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 ""
+<<<<<<< HEAD
#: src/utils/pactl.c:1909
+=======
+#: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"pactl %s\n"
@@ -2656,11 +3242,21 @@ 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 ""
@@ -2698,20 +3294,68 @@ 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 ""
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2844
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2854
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2869
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2889
+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 ""
@@ -2765,35 +3409,112 @@ 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 ""
+
+#: src/utils/pactl.c:2950
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2961
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2974
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2985
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: 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
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:3031
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3044
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3049
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:3060
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3065
+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 ""
@@ -2803,17 +3524,33 @@ 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 ""
+
+#: src/utils/pactl.c:3162
+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 ""
@@ -2823,6 +3560,17 @@ 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 ""
+
+#: 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/as.po b/po/as.po
index b871164ac..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 \n"
"Language-Team: Assamese <>\n"
@@ -169,9 +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 ৰ যিকোনো এটা) ।"
@@ -588,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 "মাইক্ৰোফোন"
@@ -611,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 "ভিডিঅ'"
@@ -655,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 "এনালগ হেড ফোন"
@@ -748,6 +779,7 @@ msgstr "নিবেশ"
#, fuzzy
msgid "Virtual Surround 7.1"
msgstr "এনালগ ছাৰাউন্ড ৭.১"
+<<<<<<< HEAD
#: src/modules/alsa/alsa-mixer.c:4563
msgid "Analog Mono"
@@ -804,6 +836,64 @@ msgstr "এনালগ ছাৰাউন্ড ২.১"
msgid "Analog Surround 3.0"
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 "মোনো"
+
+#: 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:1944 src/utils/pactl.c:337
+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 "এনালগ ছাৰাউন্ড ৩.০"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/modules/alsa/alsa-mixer.c:4582
msgid "Analog Surround 3.1"
msgstr "এনালগ ছাৰাউন্ড ৩.১"
@@ -900,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 "বন্ধ"
@@ -914,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 "
@@ -930,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 "
@@ -1020,6 +1122,7 @@ 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
@@ -1038,10 +1141,31 @@ 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
+#: src/modules/bluetooth/module-bluez5-device.c:1970
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+#, fuzzy
+msgid "Bluetooth Output"
+msgstr "এনালগ নিৰ্গম"
+
+#: 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 ""
@@ -1059,15 +1183,39 @@ 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 ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+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 ""
@@ -1081,6 +1229,21 @@ 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 ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Handsfree Audio Gateway (HFP)"
msgstr ""
@@ -1141,8 +1304,13 @@ msgstr ""
"plugin name> label= 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 ""
@@ -1178,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"
@@ -1205,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 ""
@@ -1244,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 ""
@@ -1431,6 +1621,7 @@ msgstr "ওপৰত কেন্দ্ৰস্থিত"
#: src/pulse/channelmap.c:156
msgid "Top Front Center"
msgstr "ওপৰত সন্মুখত কেন্দ্ৰস্থিত"
+<<<<<<< HEAD
#: src/pulse/channelmap.c:157
msgid "Top Front Left"
@@ -1525,6 +1716,103 @@ msgstr ""
msgid "invalid"
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
+#: src/utils/pactl.c:483 src/utils/pactl.c:504
+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 "(অবৈধ)"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/pulsecore/core-util.c:1790
#, c-format
msgid ""
@@ -1562,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 "মোডেম"
@@ -1842,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"
@@ -1897,7 +2197,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -2034,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' বৈধ নয়"
@@ -2107,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 "ফাইলৰ পৰা স্যাম্পেল সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰতে ব্যৰ্থ।"
@@ -2144,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() ব্যৰ্থ।"
@@ -2152,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"
@@ -2165,6 +2487,7 @@ 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() ব্যৰ্থ।"
@@ -2180,6 +2503,23 @@ 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() ব্যৰ্থ।"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: 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
+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 ""
@@ -2191,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 ""
@@ -2227,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 ""
@@ -2235,6 +2583,7 @@ msgstr ""
msgid "1|0"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr ""
@@ -2244,6 +2593,17 @@ 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 ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2259,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 ""
@@ -2303,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."
@@ -2312,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"
@@ -2327,17 +2703,26 @@ 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
@@ -2348,21 +2733,45 @@ msgstr[0] "সম্পূৰ্ণ জীৱনকালত বিতৰণ ক
msgstr[1] "সম্পূৰ্ণ জীৱনকালত বিতৰণ কৰা: %u blocks containing %s bytes total.\n"
#: src/utils/pactl.c:193
+=======
+
+#: src/utils/pactl.c:205
+#, 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: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"
@@ -2373,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"
@@ -2463,13 +2876,89 @@ msgstr ""
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 ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:331 src/utils/pactl.c:355
+#, fuzzy
+msgid "Unknown"
+msgstr "অজ্ঞাত নিৰ্দেশ"
+
+#: src/utils/pactl.c:332
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:335
+#, fuzzy
+msgid "Line"
+msgstr "লাইন ইন"
+
+#: src/utils/pactl.c:336
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:352
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:353
+#, fuzzy
+msgid "Analog"
+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"
@@ -2508,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"
@@ -2577,6 +3095,7 @@ 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
@@ -2586,11 +3105,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2607,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"
@@ -2627,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"
@@ -2649,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: % 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"
@@ -2725,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"
@@ -2768,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"
@@ -2803,21 +3401,34 @@ 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 ""
@@ -2827,10 +3438,22 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+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"
@@ -2848,10 +3471,30 @@ 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"
+msgstr "স্যাম্পেল আপলোড কৰতে ব্যৰ্থ: %s"
+
+#: src/utils/pactl.c:1818
+#, 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:2107
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid "Failed to upload sample: %s"
msgstr "স্যাম্পেল আপলোড কৰতে ব্যৰ্থ: %s"
+<<<<<<< HEAD
#: src/utils/pactl.c:1357
msgid "Premature end of file"
msgstr "সম্পূৰ্ণ হওয়াৰ পূৰ্বে ফাইল সমাপ্ত হয়েছে"
@@ -2901,19 +3544,79 @@ msgid "sample-cache"
msgstr ""
#: src/utils/pactl.c:1415
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr "সম্পূৰ্ণ হওয়াৰ পূৰ্বে ফাইল সমাপ্ত হয়েছে"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:2179
+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 প্ৰাপ্ত হয়েছে, প্ৰস্থান কৰা হয়েছে।"
@@ -2927,15 +3630,35 @@ msgid "Volume outside permissible range.\n"
msgstr ""
#: src/utils/pactl.c:1798
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT প্ৰাপ্ত হয়েছে, প্ৰস্থান কৰা হয়েছে।"
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "অবৈধ শব্দেৰ মাত্ৰা নিৰ্ধাৰিত"
+
+#: src/utils/pactl.c:2581
+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
@@ -2981,6 +3704,53 @@ 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -2988,13 +3758,19 @@ 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"
" -h, --help Show this help\n"
" --version Show version\n"
"\n"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -n, --client-name=NAME How to call this client on the "
@@ -3008,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"
@@ -3019,11 +3799,21 @@ 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 "লোড কৰাৰ উদ্দেশ্যে অনুগ্ৰহ কৰি এটা স্যাম্পেল ফাইল উল্লেখ কৰুন"
@@ -3057,26 +3847,74 @@ 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 "লোড কৰাৰ উদ্দেশ্যে অনুগ্ৰহ কৰি এটা স্যাম্পেল ফাইল উল্লেখ কৰুন"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "শব্দেৰ ফাইল খুলতে ব্যৰ্থ।"
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "সতৰ্কবাৰ্তা: ফাইলৰ পৰা স্যাম্পেলেৰ নিৰ্ধাৰিত মাপ নিৰ্মাণ কৰতে ব্যৰ্থ।"
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr "বাজানোৰ উদ্দেশ্যে এটা স্যাম্পেল ফাইল উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr "অপসাৰণেৰ উদ্দেশ্যে এটা স্যাম্পেল ফাইল উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2844
+msgid "You have to specify a sink input index and a sink"
+msgstr "সিংক নিবেশ ইন্ডেক্স ও এটা সিংক নিৰ্ধাৰণ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2854
+msgid "You have to specify a source output index and a source"
+msgstr "সোৰ্স নিৰ্গম ইন্ডেক্স ও এটা সোৰ্স নিৰ্ধাৰণ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2869
+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 "কাৰ্ডেৰ নাম/ইন্ডেক্স ও এটা প্ৰোফাইলেৰ নাম উল্লেখ কৰা আবশ্যক"
@@ -3086,33 +3924,65 @@ 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 "কাৰ্ডেৰ নাম/ইন্ডেক্স ও এটা প্ৰোফাইলেৰ নাম উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:2950
+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 "উৎসেৰ নাম/ইন্ডেক্স ও এটা শব্দেৰ মাত্ৰা উল্লেখ কৰা আবশ্যক"
@@ -3126,83 +3996,155 @@ 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 "উৎসেৰ নাম/ইন্ডেক্স ও এটা শব্দেৰ মাত্ৰা উল্লেখ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:3044
+msgid "You have to specify a sink input index and a volume"
+msgstr "সিংক নিবেশ ইন্ডেক্স ও শব্দেৰ মাত্ৰা নিৰ্ধাৰণ কৰা আবশ্যক"
+
+#: src/utils/pactl.c:3049
+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 003996d01..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č \n"
"Language-Team: Belarusian <>\n"
@@ -181,9 +185,13 @@ 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 debug, info, notice, warn, error)."
+"of error, warn, notice, info, debug)."
msgstr ""
"--log-level чакае значэнне ўзроўню інфарматыўнасці (лікавае ў дыяпазоне 0–4 "
"ці адно з debug, info, notice, warn, error)."
@@ -606,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 "Мікрафон"
@@ -627,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 "Відэа"
@@ -669,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 "Навушнікі"
@@ -790,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 "Гарнітура"
@@ -905,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 "Адключаны"
@@ -919,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 "
@@ -936,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 "
@@ -1050,6 +1094,7 @@ 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
@@ -1113,6 +1158,71 @@ msgstr "Навушнікі гарнітуры (HSP/HFP)"
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
+msgid "Bluetooth Input"
+msgstr "Bluetooth-уваход"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Bluetooth-выхад"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Хэндс-фры"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Навушнік"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr "Партатыўная сістэма"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Аўтамабільная сістэма"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "Hi-Fi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Тэлефон"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Прайграванне высокай якасці (A2DP-прыёмнік)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Захоп высокай якасці (A2DP-крыніца)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+#, fuzzy
+msgid "Headset Head Unit (HSP)"
+msgstr "Навушнікі гарнітуры (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+#, fuzzy
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Аўдыяшлюз гарнітуры (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+#, fuzzy
+msgid "Handsfree Head Unit (HFP)"
+msgstr "Навушнікі гарнітуры (HSP/HFP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+#, fuzzy
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr "Аўдыяшлюз гарнітуры (HSP/HFP)"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/modules/echo-cancel/module-echo-cancel.c:59
msgid ""
"source_name= source_properties= channels=<колькасць каналаў> channel_map=<схема каналаў> "
"autoloaded=<зададзены, калі гэты модуль загружаны аўтаматычна> "
"use_volume_sharing= "
+<<<<<<< HEAD
#: src/modules/module-equalizer-sink.c:1094
#: src/modules/module-equalizer-sink.c:1217
@@ -1182,6 +1293,15 @@ msgstr ""
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 ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/modules/module-filter-apply.c:47
msgid "autoclean="
msgstr "autoclean=<аўтаматычна выгрузіць нявыкарыстаныя фільтры?>"
@@ -1215,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»"
@@ -1242,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"
@@ -1280,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 ""
@@ -1491,6 +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 "(некарэктнае)"
@@ -1595,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 "Мадэм"
@@ -1875,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"
@@ -1930,7 +2088,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -2074,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»"
@@ -2147,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 "Не атрымалася вызначыць спецыфікацыю сэмплаў з файла."
@@ -2181,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() пацярпела няўдачу."
@@ -2189,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"
@@ -2202,6 +2382,7 @@ 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() пацярпела няўдачу."
@@ -2217,6 +2398,23 @@ 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() пацярпела няўдачу."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr "НАЗВА [АРГУМЕНТЫ …]"
+
+#: 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
+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 "НАЗВА"
@@ -2228,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"
@@ -2264,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 "НУМАР ПРЫЁМНІК|КРЫНІЦА"
@@ -2272,6 +2478,7 @@ msgstr "НУМАР ПРЫЁМНІК|КРЫНІЦА"
msgid "1|0"
msgstr "1|0"
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr "КАРТКА ПРОФІЛЬ"
@@ -2281,6 +2488,17 @@ 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 "КАРТКА ПРОФІЛЬ"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr "НАЗВА|НУМАР ПОРТ"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr "НАЗВА_КАРТКІ|№_КАРТЫ ПОРТ ЗРУХ"
@@ -2296,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 ""
@@ -2361,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"
@@ -2377,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 ""
@@ -2392,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"
@@ -2424,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"
@@ -2447,6 +2701,7 @@ msgstr ""
"Агаданая крыніца: %s\n"
"Cookie: %04x:%04x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2460,28 +2715,60 @@ msgid "not available"
msgstr ""
#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+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 ""
@@ -2503,26 +2790,66 @@ msgid "USB"
msgstr ""
#: src/utils/pactl.c:298
+=======
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+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"
@@ -2561,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"
@@ -2630,6 +2986,7 @@ 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
@@ -2639,11 +2996,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2660,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"
@@ -2680,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"
@@ -2702,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: % 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"
@@ -2732,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"
@@ -2781,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"
@@ -2825,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"
@@ -2859,16 +3295,25 @@ 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"
@@ -2883,16 +3328,40 @@ 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"
+msgstr ""
+
+#: src/utils/pactl.c:1711 src/utils/pactl.c:1760
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2910,11 +3379,16 @@ 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 "Заўчасны канец файла"
@@ -2972,10 +3446,70 @@ msgid "card"
msgstr "карткі"
#: src/utils/pactl.c:1427
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr "Заўчасны канец файла"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr "зʼяўленне"
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr "змяненне"
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr "выдаленне"
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr "невядомая"
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "прыёмніка"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "крыніцы"
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr "уваходу прыёмніка"
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr "выхаду крыніцы"
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr "модуля"
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr "кліента"
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr "кэша сэмплаў"
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr "сервера"
+
+#: src/utils/pactl.c:2185
+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 — выхад."
@@ -3041,6 +3575,73 @@ msgid "#N FORMATS"
msgstr "НУМАР ФАРМАТЫ"
#: src/utils/pactl.c:1865
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr "Атрыманы сігнал SIGINT — выхад."
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "Некарэктная гучнасць"
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr "Гучнасць па-за дапушчальны дыяпазоне.\n"
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr "Некарэктная колькасць значэнняў гучнасці.\n"
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr "Супярэчлівае значэнне гучнасці.\n"
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr "[параметры]"
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr "[ТЫП]"
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr "НАЗВА_ФАЙЛА [НАЗВА]"
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr "НАЗВА [ПРЫЁМНІК]"
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "НАЗВА|НУМАР ГУЧНАСЦЬ [ГУЧНАСЦЬ …]"
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "НУМАР ГУЧНАСЦЬ [ГУЧНАСЦЬ …]"
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr "НАЗВА|НУМАР 1|0|toggle"
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr "НУМАР 1|0|toggle"
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr "НУМАР ФАРМАТЫ"
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -3052,13 +3653,20 @@ 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"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -n, --client-name=NAME How to call this client on the "
@@ -3071,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"
@@ -3082,11 +3694,21 @@ 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 "Калі ласка, задайце файл сэмплаў для загрузкі"
@@ -3124,22 +3746,70 @@ 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 "Калі ласка, задайце файл сэмплаў для загрузкі"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "Не атрымалася адкрыць аўдыяфайл."
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Папярэджанне: Не атрымалася вызначыць спецыфікацыю сэмплаў з файла."
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr "Неабходна задаць назву сэмпла для прайгравання"
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr "Неабходна задаць назву сэмпла для выдалення"
+
+#: src/utils/pactl.c:2844
+msgid "You have to specify a sink input index and a sink"
+msgstr "Неабходна задаць нумар уваходу прыёмніка і прыёмнік"
+
+#: src/utils/pactl.c:2854
+msgid "You have to specify a source output index and a source"
+msgstr "Неабходна задаць нумар выхаду крыніцы і крыніцу"
+
+#: src/utils/pactl.c:2869
+msgid "You have to specify a module name and arguments."
+msgstr "Неабходна задаць назву модуля і аргументы."
+
+#: src/utils/pactl.c:2889
+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 "Неабходна задаць нумар ці назву карткі і назву профілю"
@@ -3161,19 +3831,51 @@ 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 "Неабходна задаць нумар ці назву карткі і назву профілю"
+
+#: src/utils/pactl.c:2950
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Неабходна задаць нумар ці назву прыёмніка і назву порта"
+
+#: src/utils/pactl.c:2961
+msgid "You have to specify a sink name"
+msgstr "Неабходна задаць назву прыёмніка"
+
+#: src/utils/pactl.c:2974
+msgid "You have to specify a source name/index and a port name"
+msgstr "Неабходна задаць нумар ці назву крыніцы і назву порта"
+
+#: src/utils/pactl.c:2985
+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 "Неабходна задаць нумар ці назву крыніцы і гучнасць"
@@ -3195,36 +3897,80 @@ 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 "Неабходна задаць нумар ці назву крыніцы і гучнасць"
+
+#: src/utils/pactl.c:3044
+msgid "You have to specify a sink input index and a volume"
+msgstr "Неабходна задаць нумар ўваходу прыёмніка і гучнасць"
+
+#: src/utils/pactl.c:3049
+msgid "Invalid sink input index"
+msgstr "Некарэктны нумар уваходу прыёмніка"
+
+#: src/utils/pactl.c:3060
+msgid "You have to specify a source output index and a volume"
+msgstr "Неабходна задаць нумар выхаду крыніцы і гучнасць"
+
+#: src/utils/pactl.c:3065
+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')"
@@ -3232,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"
@@ -3255,6 +4017,7 @@ msgstr ""
"Неабходна задаць нумар прыёмніка і спіс фарматаў, падзеленых кропкамі з "
"коскамі"
+<<<<<<< HEAD
#: src/utils/pactl.c:2382
msgid "You have to specify a card name/index, a port name and a latency offset"
msgstr "Неабходна задаць нумар ці назву карткі, назву порту і зрух затрымкі."
@@ -3264,6 +4027,17 @@ 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 "Неабходна задаць нумар ці назву карткі, назву порту і зрух затрымкі."
+
+#: 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/bg.po b/po/bg.po
index 8bfbe44bd..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 \n"
"Language-Team: Bulgarian >>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
-"of debug, info, notice, warn, error)."
+"of error, warn, notice, info, debug)."
msgstr ""
"--log-level очаква като аргумент ниво на диагностичност (цифра от 0 до 4 или "
"някое от debug, info, notice, warn, error)."
@@ -563,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 ""
@@ -584,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 ""
@@ -626,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 ""
@@ -653,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 ""
@@ -689,6 +726,7 @@ msgstr ""
#: src/modules/alsa/alsa-mixer.c:2817
msgid "Multichannel Output"
+<<<<<<< HEAD
msgstr ""
#: src/modules/alsa/alsa-mixer.c:2818
@@ -703,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 ""
@@ -739,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 ""
@@ -852,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 ""
@@ -866,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 "
@@ -877,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 "
@@ -942,6 +1012,7 @@ 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
@@ -1001,6 +1072,67 @@ msgstr ""
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
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/modules/echo-cancel/module-echo-cancel.c:59
msgid ""
"source_name= source_properties= use_volume_sharing= "
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 ""
@@ -1076,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 ""
@@ -1103,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 ""
@@ -1134,6 +1289,7 @@ msgstr ""
msgid "Unknown device model"
msgstr ""
+<<<<<<< HEAD
#: src/modules/raop/raop-sink.c:655
msgid "RAOP standard profile"
msgstr ""
@@ -1142,6 +1298,16 @@ msgstr ""
msgid "PulseAudio Sound Server"
msgstr ""
+=======
+#: src/modules/raop/raop-sink.c:689
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr ""
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/pulse/channelmap.c:105
msgid "Front Center"
msgstr ""
@@ -1345,6 +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 ""
@@ -1446,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 ""
@@ -1725,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 ""
@@ -1780,7 +1962,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -1859,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 ""
@@ -1930,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 ""
@@ -1964,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 ""
@@ -1972,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 ""
@@ -1985,6 +2189,7 @@ 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 ""
@@ -2000,6 +2205,23 @@ 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 ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: 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
+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 ""
@@ -2011,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 ""
@@ -2047,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 ""
@@ -2055,6 +2285,7 @@ msgstr ""
msgid "1|0"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr ""
@@ -2064,6 +2295,17 @@ 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 ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2079,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 ""
@@ -2137,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 ""
@@ -2157,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"
@@ -2183,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"
@@ -2197,6 +2475,7 @@ msgid ""
"Cookie: %04x:%04x\n"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2263,11 +2542,83 @@ 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 ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+msgid "not available"
+msgstr ""
+
+#: src/utils/pactl.c:331 src/utils/pactl.c:355
+msgid "Unknown"
+msgstr ""
+
+#: src/utils/pactl.c:332
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:335
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:336
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:352
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:353
+msgid "Analog"
+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"
@@ -2289,11 +2640,16 @@ 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"
@@ -2315,11 +2671,38 @@ 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"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr ""
+
+#: src/utils/pactl.c:721 src/utils/pactl.c:905
+#, c-format
+msgid "\tFormats:\n"
+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"
@@ -2341,6 +2724,7 @@ 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
@@ -2350,11 +2734,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2365,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"
@@ -2380,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"
@@ -2394,6 +2809,7 @@ msgid ""
"\tOwner Module: %s\n"
"\tProperties:\n"
"\t\t%s\n"
+<<<<<<< HEAD
msgstr ""
#: src/utils/pactl.c:657
@@ -2430,11 +2846,53 @@ 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
+#, c-format
+msgid "\tProfiles:\n"
+msgstr ""
+
+#: src/utils/pactl.c:1240
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:1245
+#, c-format
+msgid "\tActive Profile: %s\n"
+msgstr ""
+
+#: src/utils/pactl.c:1254
+#, c-format
+msgid ""
+"\t\t%s: %s (type: %s, priority: %u, latency offset: % usec%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:1261
+#, c-format
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
+msgstr ""
+
+#: src/utils/pactl.c:1265
+#, c-format
+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"
@@ -2456,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"
@@ -2483,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"
@@ -2505,16 +2979,25 @@ 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"
@@ -2529,16 +3012,40 @@ 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"
+msgstr ""
+
+#: src/utils/pactl.c:1711 src/utils/pactl.c:1760
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2549,11 +3056,16 @@ 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 ""
@@ -2611,10 +3123,70 @@ msgid "card"
msgstr ""
#: src/utils/pactl.c:1427
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr ""
+
+#: 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 ""
@@ -2680,6 +3252,73 @@ msgid "#N FORMATS"
msgstr ""
#: src/utils/pactl.c:1865
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -2687,20 +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"
@@ -2708,11 +3360,21 @@ 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 ""
@@ -2750,20 +3412,68 @@ 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 ""
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2844
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2854
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2869
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2889
+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 ""
@@ -2817,35 +3527,112 @@ 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 ""
+
+#: src/utils/pactl.c:2950
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2961
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2974
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2985
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: 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
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:3031
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3044
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3049
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:3060
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3065
+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 ""
@@ -2855,17 +3642,33 @@ 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 ""
+
+#: src/utils/pactl.c:3162
+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 ""
@@ -2875,6 +3678,17 @@ 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 ""
+
+#: 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/bn_IN.po b/po/bn_IN.po
index d0c34d0ee..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 \n"
"Language-Team: Bengali INDIA \n"
@@ -178,9 +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-র মধ্যে একটি মান)।"
@@ -600,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 "মাইক্রোফোন"
@@ -623,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 "ভিডিও"
@@ -667,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 "অ্যানালগ হেড-ফোন"
@@ -788,6 +819,7 @@ msgstr "অ্যানালগ স্টিরিও"
#: src/pulse/channelmap.c:770
msgid "Mono"
msgstr "মোনো"
+<<<<<<< HEAD
#: src/modules/alsa/alsa-mixer.c:4568 src/pulse/channelmap.c:774
msgid "Stereo"
@@ -859,6 +891,79 @@ msgstr "ডিজিট্যাল স্টিরিও (IEC958)"
msgid "Digital Surround 4.0 (IEC958/AC3)"
msgstr "ডিজিট্যাল সারাউন্ড ৪.০ (IEC958/AC3)"
+=======
+
+#: 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:1944 src/utils/pactl.c:337
+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)"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/modules/alsa/alsa-mixer.c:4593
msgid "Digital Surround 5.1 (IEC958/AC3)"
msgstr "ডিজিট্যাল সারাউন্ড ৫.১ (IEC958/AC3)"
@@ -911,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 "বন্ধ"
@@ -925,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 "
@@ -942,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 "
@@ -1000,6 +1117,7 @@ msgstr[1] ""
"snd_pcm_delay() থেকে প্রাপ্ত মান অত্যাধিক বড়: %li বাইট (%s%lu ms)।\n"
"সম্ভবত এটি ALSA ড্রাইভার '%s'-র একটি বাগ। অনুগ্রহ করে এই সমস্যা সম্বন্ধে ALSA "
"ডিভেলপরদের সূচিত করুন।"
+<<<<<<< HEAD
#: src/modules/alsa/alsa-util.c:1296
#, fuzzy, c-format
@@ -1051,10 +1169,64 @@ msgid "Handsfree"
msgstr ""
#: src/modules/bluetooth/module-bluez5-device.c:1901
+=======
+
+#: 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:1937
+#: src/modules/bluetooth/module-bluez5-device.c:1963
+#: src/modules/bluetooth/module-bluez5-device.c:1970
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+#, fuzzy
+msgid "Bluetooth Output"
+msgstr "অ্যানালগ আউটপুট"
+
+#: 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 ""
@@ -1072,15 +1244,39 @@ 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 ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+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 ""
@@ -1094,6 +1290,21 @@ 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 ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Handsfree Audio Gateway (HFP)"
msgstr ""
@@ -1156,8 +1367,13 @@ msgstr ""
"plugin name> label= 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 ""
@@ -1193,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"
@@ -1220,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 ""
@@ -1259,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 ""
@@ -1466,6 +1704,7 @@ 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
@@ -1582,6 +1821,125 @@ 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
+#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+#: src/utils/pactl.c:483 src/utils/pactl.c:504
+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:3609
+msgid "Built-in Audio"
+msgstr "অভ্যন্তরীণ অডিও"
+
+#: src/pulsecore/sink.c:3614
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Modem"
msgstr "মোডেম"
@@ -1861,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"
@@ -1918,7 +2280,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -2055,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' বৈধ নয়"
@@ -2128,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 "ফাইল থেকে স্যাম্পেল সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ।"
@@ -2165,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() ব্যর্থ।"
@@ -2173,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"
@@ -2186,6 +2570,7 @@ 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() ব্যর্থ।"
@@ -2201,6 +2586,23 @@ 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() ব্যর্থ।"
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: 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
+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 ""
@@ -2212,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 ""
@@ -2248,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 ""
@@ -2256,6 +2666,7 @@ msgstr ""
msgid "1|0"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr ""
@@ -2265,6 +2676,17 @@ 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 ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2280,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 ""
@@ -2348,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 ""
@@ -2370,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"
@@ -2396,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"
@@ -2419,6 +2877,7 @@ msgstr ""
"ডিফল্ট সোর্স: %s\n"
"কুকি: %08x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2432,19 +2891,43 @@ msgid "not available"
msgstr ""
#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+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 ""
@@ -2488,11 +2971,60 @@ 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 ""
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:352
+msgid "Network"
+msgstr ""
+
+#: src/utils/pactl.c:353
+#, fuzzy
+msgid "Analog"
+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"
@@ -2531,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"
@@ -2600,6 +3161,7 @@ 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
@@ -2609,11 +3171,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2630,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"
@@ -2650,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"
@@ -2672,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: % 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"
@@ -2748,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"
@@ -2791,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"
@@ -2827,21 +3468,34 @@ 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 ""
@@ -2856,11 +3510,31 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+msgid "list-handlers message response is not a JSON array"
+msgstr ""
+
+#: src/utils/pactl.c:1729
+#, c-format
+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 "
@@ -2871,11 +3545,16 @@ 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 "সম্পূর্ণ হওয়ার পূর্বে ফাইল সমাপ্ত হয়েছে"
@@ -2925,19 +3604,79 @@ msgid "sample-cache"
msgstr ""
#: src/utils/pactl.c:1415
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr "সম্পূর্ণ হওয়ার পূর্বে ফাইল সমাপ্ত হয়েছে"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:2179
+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 প্রাপ্ত হয়েছে, প্রস্থান করা হয়েছে।"
@@ -2951,15 +3690,35 @@ msgid "Volume outside permissible range.\n"
msgstr ""
#: src/utils/pactl.c:1798
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT প্রাপ্ত হয়েছে, প্রস্থান করা হয়েছে।"
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "অবৈধ শব্দের মাত্রা নির্ধারিত"
+
+#: src/utils/pactl.c:2581
+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
@@ -3005,6 +3764,53 @@ 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -3012,13 +3818,19 @@ 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"
" -h, --help Show this help\n"
" --version Show version\n"
"\n"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -n, --client-name=NAME How to call this client on the "
@@ -3032,7 +3844,11 @@ msgstr ""
"নাম\n"
"\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:1909
+=======
+#: src/utils/pactl.c:2707
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"pactl %s\n"
@@ -3043,11 +3859,21 @@ 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 "লোড করার উদ্দেশ্যে অনুগ্রহ করে একটি স্যাম্পেল ফাইল উল্লেখ করুন"
@@ -3081,26 +3907,74 @@ 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 "লোড করার উদ্দেশ্যে অনুগ্রহ করে একটি স্যাম্পেল ফাইল উল্লেখ করুন"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "শব্দের ফাইল খুলতে ব্যর্থ।"
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "সতর্কবার্তা: ফাইল থেকে স্যাম্পেলের নির্ধারিত মাপ নির্মাণ করতে ব্যর্থ।"
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr "বাজানোর উদ্দেশ্যে একটি স্যাম্পেল ফাইল উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr "অপসারণের উদ্দেশ্যে একটি স্যাম্পেল ফাইল উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2844
+msgid "You have to specify a sink input index and a sink"
+msgstr "সিংক ইনপুট ইন্ডেক্স ও একটি সিংক নির্ধারণ করা আবশ্যক"
+
+#: src/utils/pactl.c:2854
+msgid "You have to specify a source output index and a source"
+msgstr "সোর্স আউটপুট ইন্ডেক্স ও একটি সোর্স নির্ধারণ করা আবশ্যক"
+
+#: src/utils/pactl.c:2869
+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 "কার্ডের নাম/ইন্ডেক্স ও একটি প্রোফাইলের নাম উল্লেখ করা আবশ্যক"
@@ -3110,33 +3984,65 @@ 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 "কার্ডের নাম/ইন্ডেক্স ও একটি প্রোফাইলের নাম উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:2950
+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 "উৎসের নাম/ইন্ডেক্স ও একটি শব্দের মাত্রা উল্লেখ করা আবশ্যক"
@@ -3150,83 +4056,155 @@ 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 "উৎসের নাম/ইন্ডেক্স ও একটি শব্দের মাত্রা উল্লেখ করা আবশ্যক"
+
+#: src/utils/pactl.c:3044
+msgid "You have to specify a sink input index and a volume"
+msgstr "সিংক ইনপুট ইন্ডেক্স ও শব্দের মাত্রা নির্ধারণ করা আবশ্যক"
+
+#: src/utils/pactl.c:3049
+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 94db84706..a27c46947 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -28,14 +28,24 @@ 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 \n"
"Language-Team: Catalan \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 \n"
+"Language-Team: Catalan \n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
"Language: ca\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"
+"X-Generator: Weblate 4.14.1\n"
#: src/daemon/cmdline.c:113
#, fuzzy, c-format
@@ -200,6 +210,7 @@ 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)."
@@ -215,6 +226,24 @@ msgstr "--high-priority necessita un argument booleà"
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 "
+"of error, warn, notice, info, debug)."
+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à"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/daemon/cmdline.c:293
msgid "--disallow-module-loading expects boolean argument"
msgstr "--disallow-module-loading necessita un argument booleà"
@@ -229,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:', 'newfile:'."
@@ -398,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:', 'newfile:'."
+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:', 'newfile:'."
+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."
@@ -550,6 +751,7 @@ 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"
@@ -812,6 +1014,268 @@ 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"
+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:1956
+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:343
+msgid "Radio"
+msgstr "Ràdio"
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:344
+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:1964 src/utils/pactl.c:333
+msgid "Speaker"
+msgstr "Altaveu"
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:334
+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 "Micròfon de l'acoblador"
+
+#: src/modules/alsa/alsa-mixer.c:2802
+msgid "Headset Microphone"
+msgstr "Micròfon de l'auricular"
+
+#: src/modules/alsa/alsa-mixer.c:2806
+msgid "Analog Output"
+msgstr "Sortida analògica"
+
+#: src/modules/alsa/alsa-mixer.c:2808
+msgid "Headphones 2"
+msgstr "Auriculars 2"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+msgid "Headphones Mono Output"
+msgstr "Sortida mono analògica dels auriculars"
+
+#: 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:1944 src/utils/pactl.c:337
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Headset"
msgstr "Auricular"
@@ -878,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)"
@@ -894,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"
@@ -927,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"
@@ -941,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 "
@@ -957,6 +1441,7 @@ 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
@@ -1246,6 +1731,297 @@ 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
+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:1937
+#: src/modules/bluetooth/module-bluez5-device.c:1963
+#: src/modules/bluetooth/module-bluez5-device.c:1970
+msgid "Bluetooth Input"
+msgstr "Entrada bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Sortida bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Mans lliures"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Auricular"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Cotxe"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Telèfon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reproducció d'alta fidelitat (canonada A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Captura d'alta fidelitat (origen A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+#, 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= source_properties= source_master= sink_name= sink_properties= sink_master= adjust_time= adjust_threshold= format= rate= channels= channel_map= "
+"aec_method= aec_args= "
+"save_aec= autoloaded= use_volume_sharing= use_master_format= "
+msgstr ""
+"sink_name= sink_properties= "
+"master= format= rate= channels= channel_map= "
+"pulgin= label= "
+"control="
+
+#. 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= sink_properties= "
+"sink_master= format= rate= "
+"channels= channel_map= autoloaded= use_volume_sharing= "
+msgstr ""
+"sink_name= sink_properties= "
+"master= format= rate= channels= channel_map= "
+"pulgin= label= "
+"control="
+
+#: src/modules/module-equalizer-sink.c:1097
+#: src/modules/module-equalizer-sink.c:1220
+#, c-format
+msgid "FFT based equalizer on %s"
+msgstr ""
+
+#: src/modules/module-filter-apply.c:47
+msgid "autoclean="
+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= sink_properties= "
+"sink_input_properties= master= sink_master= format= "
+"rate= channels= channel_map= plugin= label= control= input_ladspaport_map= output_ladspaport_map= autoloaded= "
+msgstr ""
+"sink_name= sink_properties= "
+"master= format= rate= channels= channel_map= "
+"pulgin= label= "
+"control="
+
+#: src/modules/module-null-sink.c:46
+msgid "Clocked NULL sink"
+msgstr "Conducte NULL"
+
+#: src/modules/module-null-sink.c:356
+msgid "Null Output"
+msgstr "Sortida nul·la"
+
+#: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+#, 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:370
+#: src/modules/module-tunnel-source-new.c:354
+#, c-format
+msgid "Tunnel for %s@%s"
+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 ""
@@ -1276,6 +2052,7 @@ msgstr ""
msgid "Unknown device model"
msgstr "Codi d'error desconegut"
+<<<<<<< HEAD
#: src/modules/raop/raop-sink.c:655
msgid "RAOP standard profile"
msgstr ""
@@ -1284,6 +2061,16 @@ msgstr ""
msgid "PulseAudio Sound Server"
msgstr "Servidor de so PulseAudio"
+=======
+#: src/modules/raop/raop-sink.c:689
+msgid "RAOP standard profile"
+msgstr ""
+
+#: src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "Servidor de so PulseAudio"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/pulse/channelmap.c:105
msgid "Front Center"
msgstr "Frontal central"
@@ -1446,7 +2233,7 @@ msgstr "Auxiliar 28"
#: src/pulse/channelmap.c:150
msgid "Auxiliary 29"
-msgstr "Auxiliar 31"
+msgstr "Auxiliar 29"
#: src/pulse/channelmap.c:151
msgid "Auxiliary 30"
@@ -1487,6 +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)"
@@ -1540,6 +2331,7 @@ 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"
@@ -1719,6 +2511,187 @@ msgstr "%0.1f GB"
msgid "%0.1f MiB"
msgstr "%0.1f MB"
+=======
+
+#: 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:3609
+msgid "Built-in Audio"
+msgstr "Àudio intern"
+
+#: src/pulsecore/sink.c:3614
+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"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/pulse/sample.c:195
#, c-format
msgid "%0.1f KiB"
@@ -1822,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"
@@ -1839,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"
@@ -1869,6 +2858,7 @@ 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"
@@ -1878,6 +2868,17 @@ msgstr "Ha fallat la connexió: %s"
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"
+msgstr "Ha fallat la connexió: %s"
+
+#: src/utils/pacat.c:557
+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"
@@ -1887,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"
@@ -1924,7 +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 "
@@ -2062,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'"
@@ -2135,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."
@@ -2172,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()."
@@ -2180,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"
@@ -2193,6 +3228,7 @@ 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()."
@@ -2208,6 +3244,23 @@ 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()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: 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
+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 ""
@@ -2219,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 ""
@@ -2255,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 ""
@@ -2263,6 +3324,7 @@ msgstr ""
msgid "1|0"
msgstr "1|0"
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr ""
@@ -2272,6 +3334,17 @@ 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 ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2287,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 ""
@@ -2347,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"
@@ -2361,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 ""
@@ -2371,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"
@@ -2397,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"
@@ -2420,6 +3529,7 @@ msgstr ""
"Origen per defecte: %s\n"
"Galeta: %04x:%04x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2433,28 +3543,60 @@ msgid "not available"
msgstr ""
#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+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 ""
@@ -2476,26 +3618,66 @@ msgid "USB"
msgstr ""
#: src/utils/pactl.c:298
+=======
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+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"
@@ -2517,11 +3699,16 @@ 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"
@@ -2689,6 +3876,174 @@ msgid ""
"\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"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr "\tPort actiu: %s\n"
+
+#: src/utils/pactl.c:721 src/utils/pactl.c:905
+#, c-format
+msgid "\tFormats:\n"
+msgstr "\tFormats:\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
+#, 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:849
+#, 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: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
+msgid "n/a"
+msgstr "n/a"
+
+#: src/utils/pactl.c:924 src/utils/pactl.c:1793
+#, c-format
+msgid "Failed to get module information: %s"
+msgstr "No s'ha pogut obtenir informació del mòdul: %s"
+
+#: src/utils/pactl.c:976
+#, 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:1002
+#, c-format
+msgid "Failed to get client information: %s"
+msgstr "No s'ha pogut obtenir informació del client: %s"
+
+#: src/utils/pactl.c:1056
+#, 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:1168
+#, 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:1224
+#, 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:1238
+#, c-format
+msgid "\tProfiles:\n"
+msgstr "\tPerfils:\n"
+
+#: src/utils/pactl.c:1240
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:1245
+#, c-format
+msgid "\tActive Profile: %s\n"
+msgstr "\tPerfil actiu: %s\n"
+
+#: src/utils/pactl.c:1254
+#, c-format
+msgid ""
+"\t\t%s: %s (type: %s, priority: %u, latency offset: % usec%s%s, %s)\n"
+msgstr ""
+
+#: src/utils/pactl.c:1261
+#, 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:1265
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: src/utils/pactl.c:1290 src/utils/pactl.c:1954 src/utils/pactl.c:2022
+#, 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:1366
+#, c-format
+msgid ""
+"Sink Input #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSink: %u\n"
"\tSample Specification: %s\n"
"\tChannel Map: %s\n"
"\tFormat: %s\n"
@@ -2703,6 +4058,39 @@ msgid ""
"\t\t%s\n"
msgstr ""
+#: src/utils/pactl.c:1413 src/utils/pactl.c:1974 src/utils/pactl.c:2037
+#, 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:1489
+#, c-format
+msgid ""
+"Source Output #%u\n"
+"\tDriver: %s\n"
+"\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"
@@ -2726,10 +4114,31 @@ msgid ""
"\tBuffer Latency: %0.0f usec\n"
"\tSource Latency: %0.0f usec\n"
"\tResample method: %s\n"
+=======
+#: src/utils/pactl.c:1536
+#, c-format
+msgid "Failed to get sample information: %s"
+msgstr "No s'ha pogut obtenir informació de la mostra: %s"
+
+#: src/utils/pactl.c:1604
+#, 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"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pactl.c:841
#, c-format
msgid "Failed to get sample information: %s"
@@ -3083,35 +4492,398 @@ 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"
+msgstr "Ha fallat: %s"
+
+#: src/utils/pactl.c:1667
+#, fuzzy, c-format
+msgid "Send message failed: %s"
+msgstr "Ha fallat read(): %s"
+
+#: src/utils/pactl.c:1695
+#, c-format
+msgid "list-handlers message failed: %s"
+msgstr ""
+
+#: src/utils/pactl.c:1711 src/utils/pactl.c:1760
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+"no s'ha pogut analitzar correctament la resposta del missatge de list-"
+"handlers"
+
+#: src/utils/pactl.c:1718
+msgid "list-handlers message response is not a JSON array"
+msgstr "la resposta del missatge de list-handlers no és una matriu de JSON"
+
+#: src/utils/pactl.c:1729
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+
+#: src/utils/pactl.c:1800
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr ""
+
+#: src/utils/pactl.c:1818
+#, 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:2107
+#, c-format
+msgid "Failed to upload sample: %s"
+msgstr "No s'ha pogut pujar la mostra: %s"
+
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr "S'ha trobat un fi de fitxer prematurament"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr "nou"
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr "canvia"
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr "suprimeix"
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr "desconegut"
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "conducte"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "font"
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:2170
+#, fuzzy
+msgid "source-output"
+msgstr "font"
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr "mòdul"
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr "client"
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr "servidor"
+
+#: src/utils/pactl.c:2185
+msgid "card"
+msgstr "targeta"
+
+#: src/utils/pactl.c:2206
+#, c-format
+msgid "Event '%s' on %s #%u\n"
+msgstr "Esdeveniment '%s' en %s #%u\n"
+
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr "S'ha rebut SIGINT, s'està sortint."
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "Especificació de volum invàlida"
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr "[opcions]"
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr "[TIPUS]"
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:2661
+#, 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:2664
+#, fuzzy, c-format
+msgid ""
+"\n"
+" -h, --help Show this help\n"
+" --version Show version\n"
+"\n"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\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:2707
+#, 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:2751
+#, fuzzy, c-format
+msgid "Invalid format value '%s'"
+msgstr "Nom de flux de dades invàlid '%s'"
+
+#: src/utils/pactl.c:2778
+#, c-format
+msgid "Specify nothing, or one of: %s"
+msgstr ""
+
+#: src/utils/pactl.c:2788
+msgid "Please specify a sample file to load"
+msgstr "Si us plau, especifiqueu un fitxer de mostra per a carregar"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "No s'ha pogut obrir el fitxer de so."
+
+#: src/utils/pactl.c:2813
+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:2823
+msgid "You have to specify a sample name to play"
+msgstr "Heu d'especificar un nom de mostra a reproduir"
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr "Heu d'especificar un nom de mostra a suprimir"
+
+#: src/utils/pactl.c:2844
+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:2854
+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:2869
+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:2889
+msgid "You have to specify a module index or name"
+msgstr ""
+
+#: src/utils/pactl.c:2902
+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:2907 src/utils/pactl.c:2927
+msgid "Invalid suspend specification."
+msgstr ""
+
+#: src/utils/pactl.c:2922
+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:2939
+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:2950
+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:2961
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2974
+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:2985
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+#, 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:3008
+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:3021 src/utils/pactl.c:3101
+#, 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:3031
+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:3044
+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:3049
+msgid "Invalid sink input index"
+msgstr "Índex d'entrada del conducte invàlid"
+
+#: src/utils/pactl.c:3060
+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:3065
+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 "
@@ -3120,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 "
@@ -3144,6 +4932,7 @@ 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 ""
@@ -3153,6 +4942,17 @@ 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 ""
+
+#: src/utils/pactl.c:3201
+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 170cb1b96..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ý \n"
"Language-Team: čeština \n"
@@ -171,9 +175,10 @@ msgid "--fail expects boolean argument"
msgstr "--fail očekává jako argument pravdivostní hodnotu"
#: src/daemon/cmdline.c:265
+#, fuzzy
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
-"of debug, info, notice, warn, error)."
+"of error, warn, notice, info, debug)."
msgstr ""
"--log-level očekává jako argument úroveň záznamu (buď číselně v rozmezí 0‥4, "
"nebo jedno z debug, info, notice, warn, error)."
@@ -553,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
@@ -561,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."
@@ -594,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"
@@ -615,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"
@@ -657,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"
@@ -775,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"
@@ -889,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"
@@ -903,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 "
@@ -920,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 "
@@ -1034,6 +1086,7 @@ 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
@@ -1078,21 +1131,79 @@ 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
+msgid "Bluetooth Input"
+msgstr "Vstup přes Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Výstup přes Bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Handsfree"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Sluchátko"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr "Přenosné zařízení"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Auto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+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:2054
+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)"
@@ -1157,8 +1268,8 @@ msgstr ""
"channels= channel_map= autoloaded= use_volume_sharing="
-#: 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
#, c-format
msgid "FFT based equalizer on %s"
msgstr "Ekvalizér používající FFT na %s"
@@ -1197,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"
@@ -1224,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"
@@ -1262,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"
@@ -1473,6 +1606,7 @@ 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
+#: src/utils/pactl.c:483 src/utils/pactl.c:504
msgid "(invalid)"
msgstr "(neplatné)"
@@ -1580,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"
@@ -1860,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"
@@ -1915,7 +2061,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -2062,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“"
@@ -2134,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."
@@ -2169,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()."
@@ -2177,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"
@@ -2190,6 +2358,7 @@ 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()."
@@ -2205,6 +2374,23 @@ 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()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr "NÁZEV [ARGUMENTY…]"
+
+#: 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
+msgid "NAME|#N"
+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"
@@ -2216,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"
@@ -2252,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"
@@ -2260,6 +2454,7 @@ 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"
@@ -2269,6 +2464,17 @@ 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"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+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"
@@ -2284,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 ""
@@ -2349,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"
@@ -2362,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 ""
@@ -2374,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"
@@ -2406,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"
@@ -2429,6 +2671,7 @@ msgstr ""
"Výchozí zdroj: %s\n"
"Cookie: %04x:%04x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2442,28 +2685,60 @@ msgid "not available"
msgstr ""
#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+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 ""
@@ -2485,26 +2760,66 @@ msgid "USB"
msgstr ""
#: src/utils/pactl.c:298
+=======
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+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"
@@ -2543,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"
@@ -2612,6 +2956,7 @@ 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
@@ -2621,11 +2966,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2642,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"
@@ -2662,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"
@@ -2684,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: % 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"
@@ -2714,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"
@@ -2763,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"
@@ -2807,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"
@@ -2841,21 +3265,34 @@ 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 ""
@@ -2865,16 +3302,35 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2892,11 +3348,16 @@ 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"
@@ -2954,10 +3415,70 @@ 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"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr "nový"
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr "změnit"
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr "odstranit"
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr "neznámo"
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "cíli"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "zdroji"
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr "vstupu cíle"
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr "výstupu zdroje"
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr "modulu"
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr "klientu"
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr "mezipaměti vzorků"
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr "serveru"
+
+#: src/utils/pactl.c:2185
+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."
@@ -3023,6 +3544,73 @@ 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."
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "Neplatné zadání hlasitosti"
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr "Hlasitost mimo povolený rozsah.\n"
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr "Neplatný počet zadání hlasitosti.\n"
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr "Odporující si zadání hlasitosti.\n"
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr "[VOLBY]"
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr "[TYP]"
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr "NÁZEV_SOUBORU [NÁZEV]"
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr "NÁZEV [CÍL]"
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NÁZEV|ČÍSLO HLASITOST [HLASITOST …]"
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "ČÍSLO HLASITOST [HLASITOST …]"
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr "NÁZEV|ČÍSLO 1|0|toggle"
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr "ČÍSLO 1|0|toggle"
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr "ČÍSLO FORMÁTY"
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -3033,13 +3621,20 @@ 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"
" --version Show version\n"
"\n"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -n, --client-name=NAME How to call this client on the "
@@ -3054,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"
@@ -3065,11 +3664,21 @@ 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í"
@@ -3107,20 +3716,68 @@ 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í"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "Selhalo otevření zvukového souboru."
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Varování: Selhalo zjištění specifikace vzorku ze souboru."
+
+#: src/utils/pactl.c:2823
+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:2835
+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:2844
+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:2854
+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:2869
+msgid "You have to specify a module name and arguments."
+msgstr "Je nutné zadat název modulu a argumenty"
+
+#: src/utils/pactl.c:2889
+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"
@@ -3142,19 +3799,51 @@ 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"
+
+#: src/utils/pactl.c:2950
+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:2961
+msgid "You have to specify a sink name"
+msgstr "Je nutné zadat název cíle"
+
+#: src/utils/pactl.c:2974
+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:2985
+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"
@@ -3176,36 +3865,80 @@ 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"
+
+#: src/utils/pactl.c:3044
+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:3049
+msgid "Invalid sink input index"
+msgstr "Neplatný index vstupu cíle"
+
+#: src/utils/pactl.c:3060
+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:3065
+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')"
@@ -3213,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"
@@ -3236,6 +3985,7 @@ 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"
@@ -3245,6 +3995,17 @@ 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"
+
+#: src/utils/pactl.c:3201
+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 657952071..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 \n"
"Language-Team: Danish >>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Microphone"
msgstr "Mikrofon"
@@ -616,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"
@@ -658,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"
@@ -771,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"
@@ -884,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"
@@ -898,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 "
@@ -915,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 "
@@ -1014,6 +1055,7 @@ 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
@@ -1070,6 +1112,64 @@ 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
+msgid "Bluetooth Input"
+msgstr "Bluetooth-input"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Bluetooth-output"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Håndfri"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Hovedtelefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr "Bærbar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Bil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Hi-fi-afspilning (A2DP-sink)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Hi-fi-optagelse (A2DP-kilde)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+msgid "Headset Head Unit (HSP)"
+msgstr "Headset-hovedenhed (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Headset-lydport (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+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)"
@@ -1132,8 +1232,8 @@ msgstr ""
"channel_map= autoloaded= use_volume_sharing= "
-#: 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
#, c-format
msgid "FFT based equalizer on %s"
msgstr "FFT-baseret equalizer på %s"
@@ -1172,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"
@@ -1199,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"
@@ -1237,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"
@@ -1448,6 +1570,7 @@ msgstr "Top Rear Right"
#: 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
+#: src/utils/pactl.c:483 src/utils/pactl.c:504
msgid "(invalid)"
msgstr "(ugyldig)"
@@ -1554,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"
@@ -1833,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"
@@ -1872,7 +2007,7 @@ msgid "pa_stream_update_timing_info() failed: %s"
msgstr "pa_stream_update_timing_info() mislykkedes: %s"
#: src/utils/pacat.c:676
-#, c-format
+#, fuzzy, c-format
msgid ""
"%s [options]\n"
"%s\n"
@@ -1888,7 +2023,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -2032,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'"
@@ -2104,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."
@@ -2138,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."
@@ -2146,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"
@@ -2159,6 +2316,7 @@ 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."
@@ -2174,6 +2332,23 @@ 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."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr "NAVN [ARGUMENTER ...]"
+
+#: 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
+msgid "NAME|#N"
+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"
@@ -2185,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"
@@ -2221,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"
@@ -2229,6 +2412,7 @@ 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"
@@ -2238,6 +2422,17 @@ 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"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+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"
@@ -2253,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]"
@@ -2319,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 ""
@@ -2339,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"
@@ -2371,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"
@@ -2394,6 +2625,7 @@ msgstr ""
"Standard kilde: %s\n"
"Cookie: %04x:%04x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr "tilgængelighed ukendt"
@@ -2460,11 +2692,83 @@ 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"
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr "tilgængelig"
+
+#: src/utils/pactl.c:322
+msgid "not available"
+msgstr "ikke tilgængelig"
+
+#: src/utils/pactl.c:331 src/utils/pactl.c:355
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: src/utils/pactl.c:332
+msgid "Aux"
+msgstr "Aux"
+
+#: src/utils/pactl.c:335
+msgid "Line"
+msgstr "Line"
+
+#: src/utils/pactl.c:336
+msgid "Mic"
+msgstr "Mik."
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr "Håndsæt"
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr "Øresnegl"
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:352
+msgid "Network"
+msgstr "Netværk"
+
+#: src/utils/pactl.c:353
+msgid "Analog"
+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"
@@ -2503,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"
@@ -2572,6 +2905,7 @@ 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
@@ -2581,11 +2915,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2602,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"
@@ -2622,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"
@@ -2644,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: % usec%s%s, %s)\n"
@@ -2667,7 +3048,11 @@ msgstr ""
"\t\t%s: %s (type: %s, prioritet: %u, forsinkelse-forskydning: % usec"
"%s%s, %s)\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:679
+=======
+#: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\t\t\tProperties:\n"
@@ -2676,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"
@@ -2725,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"
@@ -2769,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"
@@ -2803,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 "
@@ -2852,11 +3297,16 @@ 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"
@@ -2914,10 +3364,70 @@ 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"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr "ny"
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr "skift"
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr "fjern"
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr "ukendt"
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "sink"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "kilde"
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr "input for sink"
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr "output for kilde"
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr "modul"
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr "klient"
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr "mellemlager for sample"
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr "server"
+
+#: src/utils/pactl.c:2185
+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."
@@ -2983,6 +3493,73 @@ msgid "#N FORMATS"
msgstr "#N FORMATER"
#: src/utils/pactl.c:1865
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr "Fik SIGINT, afslutter."
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "Ugyldig lydstyrkespecifikation"
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr "Lydstyrke er udenfor det tilladte område.\n"
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ugyldigt antal lydstyrkespecifikationer.\n"
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr "Usammenhængende lydstyrkespecifikation.\n"
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr "[tilvalg]"
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr "[TYPE]"
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr "FILNAVN [NAVN]"
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr "NAVN [SINK]"
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAVN|#N LYDSTYRKE [LYDSTYRKE ...]"
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N LYDSTYRKE [LYDSTYRKE ...]"
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAVN|#N 1|0|toggle"
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr "#N FORMATER"
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -2993,13 +3570,20 @@ 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"
" --version Show version\n"
"\n"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -n, --client-name=NAME How to call this client on the "
@@ -3014,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"
@@ -3025,11 +3613,21 @@ 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"
@@ -3067,20 +3665,68 @@ 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"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "Kunne ikke åbne lydfil."
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Advarsel: Kunne ikke fastslå samplespecifikation ud fra fil."
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr "Du skal angive et samplenavn som skal afspilles"
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr "Du skal angive et samplenavn som skal fjernes"
+
+#: src/utils/pactl.c:2844
+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:2854
+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:2869
+msgid "You have to specify a module name and arguments."
+msgstr "Du skal angive et modulnavn og argumenter."
+
+#: src/utils/pactl.c:2889
+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"
@@ -3102,19 +3748,51 @@ 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"
+
+#: src/utils/pactl.c:2950
+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:2961
+msgid "You have to specify a sink name"
+msgstr "Du skal angive et sinknavn"
+
+#: src/utils/pactl.c:2974
+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:2985
+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"
@@ -3136,33 +3814,77 @@ 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"
+
+#: src/utils/pactl.c:3044
+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:3049
+msgid "Invalid sink input index"
+msgstr "Ugyldigt sinkinput-indeks"
+
+#: src/utils/pactl.c:3060
+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:3065
+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')"
@@ -3170,6 +3892,7 @@ 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"
@@ -3179,6 +3902,17 @@ 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"
+
+#: src/utils/pactl.c:3162
+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."
@@ -3186,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"
@@ -3194,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 fbb3a2c70..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 \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 \n"
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
"Language-Team: German \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
@@ -190,7 +200,7 @@ msgstr "--fail erfordert boolesche Variable"
#: 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)."
+"of error, warn, notice, info, debug)."
msgstr ""
"--log-level erfordert Parameter für Grad der Protokollierung (entweder "
"numerisch im Bereich 0..4 oder einen dieser: debug, info, notice, warn, "
@@ -217,14 +227,16 @@ 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:', 'newfile:'."
msgstr ""
-"Ungültiges Protokollziel: Benutzen Sie entweder »syslog«, »journal«, "
-"»stderr« oder »auto« oder einen gültigen Dateinamen »file:«, »newfile:"
-"«."
+"Ungültiges Protokollziel: Benutzen Sie entweder »syslog«, »journal«, »stderr«"
+" oder »auto« oder einen gültigen Dateinamen »file:«, »newfile:«."
#: src/daemon/cmdline.c:330
msgid ""
@@ -567,6 +579,7 @@ 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."
@@ -578,6 +591,18 @@ msgid ""
"Source of commands: %s"
msgstr ""
+=======
+msgid "command line arguments"
+msgstr "Befehlszeilenargumente"
+
+#: 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 "Hintergrunddienst verweigert Ausführung, da keine Module geladen."
@@ -611,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"
@@ -632,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"
@@ -674,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"
@@ -700,6 +745,7 @@ msgid "Analog Output"
msgstr "Analoge Ausgabe"
#: src/modules/alsa/alsa-mixer.c:2808
+<<<<<<< HEAD
#, fuzzy
msgid "Headphones 2"
msgstr "Kopfhörer"
@@ -709,6 +755,15 @@ msgstr "Kopfhörer"
msgid "Headphones Mono Output"
msgstr "Analoge Mono-Ausgabe"
+=======
+msgid "Headphones 2"
+msgstr "Kopfhörer 2"
+
+#: src/modules/alsa/alsa-mixer.c:2809
+msgid "Headphones Mono Output"
+msgstr "Kopfhörer Mono-Ausgabe"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/modules/alsa/alsa-mixer.c:2810
msgid "Line Out"
msgstr "Line-Ausgang"
@@ -742,6 +797,7 @@ msgid "Multichannel Output"
msgstr "Mehrkanalausgang"
#: src/modules/alsa/alsa-mixer.c:2818
+<<<<<<< HEAD
#, fuzzy
msgid "Game Output"
msgstr "%s-Ausgabe"
@@ -760,12 +816,29 @@ msgstr "%s-Eingabe"
#, fuzzy
msgid "Virtual Surround 7.1"
msgstr "Virtuelles Surround-Ziel"
+=======
+msgid "Game Output"
+msgstr "Spiel-Ausgabe"
+
+#: src/modules/alsa/alsa-mixer.c:2819 src/modules/alsa/alsa-mixer.c:2820
+msgid "Chat Output"
+msgstr "Chat-Ausgabe"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+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"
@@ -774,6 +847,14 @@ msgstr "Analog Mono"
#, 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"
@@ -795,14 +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"
@@ -878,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"
@@ -901,6 +999,7 @@ msgid "Multichannel Duplex"
msgstr "Mehrkanal-Duplex"
#: src/modules/alsa/alsa-mixer.c:4738
+<<<<<<< HEAD
#, fuzzy
msgid "Stereo Duplex"
msgstr "Analog Stereo Duplex"
@@ -911,6 +1010,17 @@ 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"
+
+#: 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:2263
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Off"
msgstr "Aus"
@@ -924,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 "
@@ -942,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 "
@@ -1042,6 +1160,7 @@ 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
@@ -1104,6 +1223,66 @@ msgstr "Kopfhörer Kopf-Einheit (HSP/HFP)"
#, 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
+msgid "Bluetooth Input"
+msgstr "Bluetooth-Eingabe"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Bluetooth-Ausgabe"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Freisprecheinrichtung"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Kopfhörer"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr "tragbar"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Auto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Telefon"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "High Fidelity Wiedergabe (A2DP-Ziel)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "High Fidelity Aufnahme (A2DP-Quelle)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+msgid "Headset Head Unit (HSP)"
+msgstr "Kopfhörer Kopf-Einheit (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Kopfhörer Audio-Gateway (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+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 ""
@@ -1166,8 +1345,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 ""
@@ -1207,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"
@@ -1234,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"
@@ -1268,6 +1470,7 @@ msgstr ""
"zu/left_hrir.wav "
#: src/modules/raop/module-raop-discover.c:295
+<<<<<<< HEAD
#, fuzzy
msgid "Unknown device model"
msgstr "Unbekannter Fehlercode"
@@ -1275,6 +1478,14 @@ 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"
@@ -1483,6 +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)"
@@ -1590,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"
@@ -1874,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"
@@ -1929,7 +2156,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -2078,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«"
@@ -2149,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."
@@ -2184,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"
@@ -2192,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"
@@ -2205,6 +2454,7 @@ 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."
@@ -2220,6 +2470,23 @@ 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."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr "NAME [ARGUMENTE …]"
+
+#: 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
+msgid "NAME|#N"
+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"
@@ -2231,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"
@@ -2267,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"
@@ -2275,6 +2550,7 @@ 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"
@@ -2284,6 +2560,17 @@ 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"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+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"
@@ -2299,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 ""
@@ -2364,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 ""
@@ -2384,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"
@@ -2416,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"
@@ -2439,6 +2763,7 @@ msgstr ""
"Standard-Quelle: %s\n"
"Cookie: %04x:%04x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2461,10 +2786,34 @@ msgid "Aux"
msgstr ""
#: src/utils/pactl.c:287
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr "Verfügbarkeit unbekannt"
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr "verfügbar"
+
+#: src/utils/pactl.c:322
+msgid "not available"
+msgstr "nicht verfügbar"
+
+#: src/utils/pactl.c:331 src/utils/pactl.c:355
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: src/utils/pactl.c:332
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:335
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, fuzzy
msgid "Line"
msgstr "Line-Eingang"
+<<<<<<< HEAD
#: src/utils/pactl.c:288
msgid "Mic"
msgstr ""
@@ -2510,11 +2859,59 @@ 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"
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr "Hörer"
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr "Ohrhörer"
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:352
+msgid "Network"
+msgstr "Netzwerk"
+
+#: src/utils/pactl.c:353
+msgid "Analog"
+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"
@@ -2553,11 +2950,16 @@ 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"
@@ -2568,22 +2970,47 @@ 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"
+msgstr "\t\t%s: %s (Typ: %s, Priorität: %u%s%s, %s)\n"
+
+#: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
+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"
@@ -2622,6 +3049,7 @@ 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
@@ -2631,11 +3059,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2652,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"
@@ -2672,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"
@@ -2694,28 +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: % usec%s%s, %s)\n"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pactl.c:679
+=======
+"\t\t%s: %s (Typ: %s, Priorität: %u, Latenzversatz: % usec%s%s, %s)\n"
+
+#: src/utils/pactl.c:1261
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\t\t\tProperties:\n"
@@ -2724,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"
@@ -2773,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"
@@ -2817,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"
@@ -2851,21 +3360,35 @@ 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 ""
@@ -2875,16 +3398,35 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2899,11 +3441,16 @@ 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"
@@ -2961,10 +3508,70 @@ 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"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr "neu"
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr "ändern"
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr "entfernen"
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr "unbekannt"
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "Ziel"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "Quelle"
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr "Ziel-Eingabe"
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr "Quellen-Eingabe"
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr "Modul"
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr "Client"
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr "Sample-Pufferspeicher"
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr "Server"
+
+#: src/utils/pactl.c:2185
+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."
@@ -3030,6 +3637,73 @@ 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."
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "Ungültige Angabe der Lautstärke"
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr "Lautstärke ist außerhalb des einstellbaren Bereichs.\n"
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ungültige Anzahl in der Lautstärkeangabe.\n"
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr "Inkonsistente Angabe der Lautstärke.\n"
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr "[Optionen]"
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr "[TYP]"
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr "DATEINAME [NAME]"
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr "NAME [ZIEL]"
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAME|#N LAUTSTÄRKE [LAUTSTÄRKE …]"
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N LAUTSTÄRKE [LAUTSTÄRKE …]"
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAME|#N 1|0|toggle"
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr "#N FORMATE"
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -3042,13 +3716,20 @@ 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"
" --version Show version\n"
"\n"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -n, --client-name=NAME How to call this client on the "
@@ -3064,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"
@@ -3075,11 +3760,21 @@ 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"
@@ -3105,10 +3800,38 @@ 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"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "Öffnen der Audio-Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Warnung: Beziehen der Abtastwert-Angabe aus Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
+
+#: src/utils/pactl.c:2835
+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:2844
+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."
@@ -3118,17 +3841,36 @@ 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."
+
+#: src/utils/pactl.c:2889
+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."
@@ -3136,6 +3878,7 @@ 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."
@@ -3157,10 +3900,34 @@ 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."
+
+#: src/utils/pactl.c:2950
+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:2961
+msgid "You have to specify a sink name"
+msgstr "Sie müssen einen Ziel-Namen angeben."
+
+#: 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
+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."
@@ -3183,45 +3950,98 @@ 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."
+
+#: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+#, fuzzy
+msgid "You have to specify a source name/index"
+msgstr "Sie müssen einen Quellennamen/-index angeben"
+
+#: 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"
+
+#: src/utils/pactl.c:3044
+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:3049
+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')"
@@ -3229,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"
@@ -3252,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 825960b4d..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 \n"
"Language-Team: German \n"
@@ -167,9 +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)."
@@ -582,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 ""
@@ -606,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 ""
@@ -648,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"
@@ -778,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 ""
@@ -904,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"
@@ -918,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 "
@@ -929,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 "
@@ -1022,6 +1069,7 @@ 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
@@ -1030,19 +1078,38 @@ 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
+msgid "Bluetooth Input"
+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 ""
@@ -1060,15 +1127,39 @@ 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 ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+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 ""
@@ -1082,6 +1173,21 @@ 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 ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Handsfree Audio Gateway (HFP)"
msgstr ""
@@ -1129,8 +1235,13 @@ msgid ""
"this module is being loaded automatically> use_volume_sharing= "
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 ""
@@ -1161,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"
@@ -1190,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 ""
@@ -1223,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 ""
@@ -1434,6 +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)"
@@ -1484,6 +1621,7 @@ 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
@@ -1549,6 +1687,73 @@ msgstr "Internes Audio"
msgid "Modem"
msgstr "Modem"
+=======
+
+#: 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:3609
+msgid "Built-in Audio"
+msgstr "Internes Audio"
+
+#: src/pulsecore/sink.c:3614
+msgid "Modem"
+msgstr "Modem"
+
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/pulse/error.c:38
msgid "OK"
msgstr "OK"
@@ -1821,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"
@@ -1876,7 +2085,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -1997,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'"
@@ -2068,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."
@@ -2104,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"
@@ -2112,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"
@@ -2125,6 +2356,7 @@ 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."
@@ -2140,6 +2372,23 @@ 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."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: 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
+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 ""
@@ -2151,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 ""
@@ -2187,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 ""
@@ -2195,6 +2452,7 @@ msgstr ""
msgid "1|0"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr ""
@@ -2204,6 +2462,17 @@ 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 ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2219,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 ""
@@ -2262,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."
@@ -2271,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"
@@ -2286,17 +2571,26 @@ 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
@@ -2307,21 +2601,45 @@ 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
+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: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"
@@ -2332,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"
@@ -2355,6 +2677,7 @@ msgstr ""
"-Standard-Quelle: %s\n"
"Cookie: %08x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2368,10 +2691,26 @@ msgid "not available"
msgstr ""
#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+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 ""
@@ -2417,17 +2756,73 @@ msgid "Network"
msgstr ""
#: src/utils/pactl.c:305
+=======
+#: src/utils/pactl.c:332
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:335
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:336
+msgid "Mic"
+msgstr ""
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr ""
+
+#: src/utils/pactl.c:352
+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"
@@ -2466,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"
@@ -2535,6 +2959,7 @@ 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
@@ -2544,11 +2969,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2565,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"
@@ -2585,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"
@@ -2607,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: % 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"
@@ -2683,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"
@@ -2726,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"
@@ -2761,21 +3265,34 @@ 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 ""
@@ -2785,16 +3302,35 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2805,11 +3341,16 @@ 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"
@@ -2843,10 +3384,46 @@ 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"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "Sink"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "Quelle"
+
+#: src/utils/pactl.c:2167
+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 ""
@@ -2860,19 +3437,43 @@ msgid "sample-cache"
msgstr ""
#: src/utils/pactl.c:1415
+=======
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:2179
+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."
@@ -2886,15 +3487,35 @@ 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."
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "Ungültige Sample-Angaben"
+
+#: src/utils/pactl.c:2581
+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
@@ -2940,6 +3561,53 @@ 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -2947,13 +3615,19 @@ 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"
" -h, --help Show this help\n"
" --version Show version\n"
"\n"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -n, --client-name=NAME How to call this client on the "
@@ -2966,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"
@@ -2977,11 +3655,21 @@ 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"
@@ -3007,32 +3695,79 @@ 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"
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr "Öffnen der Audio-Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Warnung: Beziehen der Sample-Angabe aus Datei fehlgeschlagen."
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
+
+#: src/utils/pactl.c:2835
+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:2844
+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."
@@ -3040,6 +3775,7 @@ 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"
@@ -3049,33 +3785,65 @@ 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"
+
+#: src/utils/pactl.c:2950
+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"
@@ -3089,84 +3857,156 @@ 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"
+
+#: src/utils/pactl.c:3044
+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:3049
+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 8caa491b3..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 (Δημήτρης Σπίγγος) \n"
"Language-Team: team@lists.gnome.gr\n"
@@ -181,9 +185,13 @@ 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 debug, info, notice, warn, error)."
+"of error, warn, notice, info, debug)."
msgstr ""
"Το --log-level περιμένει όρισμα επιπέδου καταγραφής (είτε αριθμητικό σε "
"διάστημα 0..4 ή ένα όρισμα αποσφαλμάτωσης, πληροφορίας, ειδοποίησης, "
@@ -620,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 "Μικρόφωνο"
@@ -641,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 "Βίντεο"
@@ -683,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 "Ακουστικά"
@@ -751,6 +779,7 @@ msgstr "Αναλογική 4κάναλη είσοδος"
#, fuzzy
msgid "Multichannel Output"
msgstr "Μηδενική έξοδος"
+<<<<<<< HEAD
#: src/modules/alsa/alsa-mixer.c:2818
#, fuzzy
@@ -772,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 "Αναλογικό μονοφωνικό"
@@ -806,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 "Ακουστικά"
@@ -921,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 "Ανενεργό"
@@ -935,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 "
@@ -952,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 "
@@ -1051,6 +1119,7 @@ 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
@@ -1107,6 +1176,64 @@ 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
+msgid "Bluetooth Input"
+msgstr "Είσοδος μπλουτούθ"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Έξοδος μπλουτούθ"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Ανοιχτής ακρόασης"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Ακουστικό"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr "Φορητό"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Αυτοκίνητο"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "Υψηλή πιστότητα"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Αναπαραγωγή υψηλής ποιότητας (δέκτης A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Λήψη υψηλής ποιότητας (πηγή A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "Handsfree Audio Gateway (HFP)"
msgstr ""
@@ -1172,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 ""
@@ -1212,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"
@@ -1239,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"
@@ -1277,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 ""
@@ -1488,6 +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 "(άκυρο)"
@@ -1595,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 "Μόντεμ"
@@ -1878,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"
@@ -1933,7 +2103,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -2079,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'"
@@ -2152,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 "Αποτυχία προσδιορισμού προδιαγραφής δείγματος από το αρχείο."
@@ -2187,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()."
@@ -2195,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"
@@ -2208,6 +2400,7 @@ 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()."
@@ -2223,6 +2416,23 @@ 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()."
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr "ΟΝΟΜΑ [ΟΡΙΣΜΑΤΑ ...]"
+
+#: 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
+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 "ΟΝΟΜΑ"
@@ -2234,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"
@@ -2270,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 "#Ν ΔΕΚΤΗΣ|ΠΗΓΗ"
@@ -2278,6 +2496,7 @@ msgstr "#Ν ΔΕΚΤΗΣ|ΠΗΓΗ"
msgid "1|0"
msgstr "1|0"
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr "ΚΑΤΑΤΟΜΗ ΚΑΡΤΑΣ"
@@ -2287,6 +2506,17 @@ 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 "ΚΑΤΑΤΟΜΗ ΚΑΡΤΑΣ"
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr "ΟΝΟΜΑ|ΘΥΡΑ #Ν"
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr "ΟΝΟΜΑ ΚΑΡΤΑΣ|ΚΑΡΤΑ-#Ν ΑΝΤΙΣΤΑΘΜΙΣΗ ΘΥΡΑΣ"
@@ -2303,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 ""
@@ -2369,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"
@@ -2383,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 ""
@@ -2395,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"
@@ -2427,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"
@@ -2450,6 +2716,7 @@ msgstr ""
"Προεπιλεγμένη πηγή: %s\n"
"Μπισκότο: %04x:%04x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2463,28 +2730,60 @@ msgid "not available"
msgstr ""
#: src/utils/pactl.c:283 src/utils/pactl.c:307
+=======
+#: src/utils/pactl.c:320
+msgid "availability unknown"
+msgstr ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr ""
+
+#: src/utils/pactl.c:322
+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 ""
@@ -2506,26 +2805,66 @@ msgid "USB"
msgstr ""
#: src/utils/pactl.c:298
+=======
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+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"
@@ -2564,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"
@@ -2633,6 +3001,7 @@ 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
@@ -2642,11 +3011,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2663,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"
@@ -2683,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"
@@ -2705,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: % 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"
@@ -2735,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"
@@ -2784,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"
@@ -2828,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"
@@ -2862,21 +3310,34 @@ 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 ""
@@ -2886,16 +3347,35 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2910,11 +3390,16 @@ 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 "Πρόωρο τέλος του αρχείου"
@@ -2972,10 +3457,70 @@ msgid "card"
msgstr "κάρτα"
#: src/utils/pactl.c:1427
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr "Πρόωρο τέλος του αρχείου"
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr "νέο"
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr "αλλαγή"
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr "αφαίρεση"
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr "άγνωστο"
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "δέκτης"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "πηγή"
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr "είσοδος δέκτη"
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr "έξοδος πηγής"
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr "ενότητα"
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr "πελάτης"
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr "κρυφή μνήμη δείγματος"
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr "διακομιστής"
+
+#: src/utils/pactl.c:2185
+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, έξοδος."
@@ -3041,6 +3586,73 @@ msgid "#N FORMATS"
msgstr "ΜΟΡΦΕΣ #Ν"
#: src/utils/pactl.c:1865
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr "Ελήφθη SIGINT, έξοδος."
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr "Άκυρη προδιαγραφή έντασης"
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr "Η ένταση εκτός επιτρεπτής περιοχής.\n"
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr "Άκυρος αριθμός προδιαγραφών έντασης.\n"
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr "Ασύμβατη προδιαγραφή έντασης.\n"
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr "[επιλογές]"
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr "[ΤΥΠΟΣ]"
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr "ΟΝΟΜΑΑΡΧΕΙΟΥ [ΟΝΟΜΑ]"
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr "ΟΝΟΜΑ [ΔΕΚΤΗΣ]"
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "ΟΝΟΜΑ| ΕΝΤΑΣΗ #Ν [ΕΝΤΑΣΗ ...]"
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N ΕΝΤΑΣΗ [ΕΝΤΑΣΗ ...]"
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr "ΟΝΟΜΑ|#Ν 1|0|εναλλαγή"
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr "#Ν 1|0|εναλλαγή"
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr "ΜΟΡΦΕΣ #Ν"
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -3052,13 +3664,20 @@ 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"
+" -f, --format=FORMAT The format of the output. Either "
+"\"normal\" or \"json\"\n"
" -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 +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"
@@ -3083,11 +3706,21 @@ 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 "Παρακαλούμε ορίστε ένα αρχείο δείγματος για φόρτωση"
@@ -3097,10 +3730,22 @@ 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 "Παρακαλούμε ορίστε ένα αρχείο δείγματος για φόρτωση"
+
+#: src/utils/pactl.c:2801
+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 "Πρέπει να ορίσετε ένα όνομα δείγματος για αναπαραγωγή"
@@ -3126,17 +3771,52 @@ 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 "Πρέπει να ορίσετε ένα όνομα δείγματος για αναπαραγωγή"
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr "Πρέπει να ορίσετε ένα όνομα δείγματος για αφαίρεση"
+
+#: src/utils/pactl.c:2844
+msgid "You have to specify a sink input index and a sink"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εισόδου δέκτη και έναν δέκτη"
+
+#: src/utils/pactl.c:2854
+msgid "You have to specify a source output index and a source"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εξόδου πηγής και μια πηγή"
+
+#: src/utils/pactl.c:2869
+msgid "You have to specify a module name and arguments."
+msgstr "Πρέπει να ορίσετε ένα όνομα ενότητας και ορίσματα."
+
+#: src/utils/pactl.c:2889
+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."
@@ -3144,6 +3824,7 @@ msgstr ""
"Δεν μπορείτε να ορίσετε περισσότερες από μία πηγές. Πρέπει να ορίσετε μια "
"τιμή Μπουλ."
+<<<<<<< HEAD
#: src/utils/pactl.c:2127
msgid "You have to specify a card name/index and a profile name"
msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη κάρτας και ένα όνομα κατατομής"
@@ -3165,19 +3846,51 @@ 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 "Πρέπει να ορίσετε ένα όνομα/δείκτη κάρτας και ένα όνομα κατατομής"
+
+#: src/utils/pactl.c:2950
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη δέκτη και ένα όνομα θύρας"
+
+#: src/utils/pactl.c:2961
+msgid "You have to specify a sink name"
+msgstr "Πρέπει να ορίσετε ένα όνομα δέκτη"
+
+#: src/utils/pactl.c:2974
+msgid "You have to specify a source name/index and a port name"
+msgstr "Πρέπει να ορίσετε ένα όνομα/δείκτη πηγής και ένα όνομα θύρας"
+
+#: src/utils/pactl.c:2985
+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 "Πρέπει να ορίσετε ένα όνομα/δείκτη πηγής και μια ένταση"
@@ -3199,55 +3912,115 @@ 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 "Πρέπει να ορίσετε ένα όνομα/δείκτη πηγής και μια ένταση"
+
+#: src/utils/pactl.c:3044
+msgid "You have to specify a sink input index and a volume"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εισόδου δέκτη και μια ένταση"
+
+#: src/utils/pactl.c:3049
+msgid "Invalid sink input index"
+msgstr "Άκυρος δείκτης εισόδου δέκτη"
+
+#: src/utils/pactl.c:3060
+msgid "You have to specify a source output index and a volume"
+msgstr "Πρέπει να ορίσετε έναν δείκτη εξόδου πηγής και μια ένταση"
+
+#: src/utils/pactl.c:3065
+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"
@@ -3255,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 bec38cc7a..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 \n"
"Language-Team: Esperanto >>>>>> 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,7 @@ 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
@@ -921,21 +966,79 @@ 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
+msgid "Bluetooth Input"
+msgstr "Bludenta enigo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Bludenta eligo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Libermana"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Kapaŭskultilo"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Aŭto"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "HiFi"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Telefono"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Altfidela ludado (A2DP-celo)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+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= "
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,6 +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)"
@@ -1385,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 ""
@@ -1664,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 ""
@@ -1719,7 +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 "
@@ -1798,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 ""
@@ -1869,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 ""
@@ -1903,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 ""
@@ -1911,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 ""
@@ -1924,6 +2096,7 @@ 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 ""
@@ -1939,6 +2112,23 @@ 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 ""
+
+#: src/utils/pacmd.c:51 src/utils/pactl.c:2643
+msgid "NAME [ARGS ...]"
+msgstr ""
+
+#: 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
+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 ""
@@ -1950,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 ""
@@ -1986,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 ""
@@ -1994,6 +2192,7 @@ msgstr ""
msgid "1|0"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pacmd.c:72 src/utils/pactl.c:1851
msgid "CARD PROFILE"
msgstr ""
@@ -2003,6 +2202,17 @@ 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 ""
+
+#: src/utils/pacmd.c:73 src/utils/pactl.c:2650
+msgid "NAME|#N PORT"
+msgstr ""
+
+#: src/utils/pacmd.c:74 src/utils/pactl.c:2658
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD-NAME|CARD-#N PORT OFFSET"
msgstr ""
@@ -2018,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 ""
@@ -2076,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 ""
@@ -2096,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"
@@ -2122,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"
@@ -2136,6 +2382,7 @@ msgid ""
"Cookie: %04x:%04x\n"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr ""
@@ -2202,11 +2449,83 @@ 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 ""
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr "disponebla"
+
+#: src/utils/pactl.c:322
+msgid "not available"
+msgstr "nedisponebla"
+
+#: src/utils/pactl.c:331 src/utils/pactl.c:355
+msgid "Unknown"
+msgstr "Nekonata"
+
+#: src/utils/pactl.c:332
+msgid "Aux"
+msgstr ""
+
+#: src/utils/pactl.c:335
+msgid "Line"
+msgstr ""
+
+#: src/utils/pactl.c:336
+msgid "Mic"
+msgstr "Mikrofono"
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr ""
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr ""
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr ""
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr ""
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr ""
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr ""
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr "Bludento"
+
+#: src/utils/pactl.c:352
+msgid "Network"
+msgstr "Reto"
+
+#: src/utils/pactl.c:353
+msgid "Analog"
+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"
@@ -2228,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"
@@ -2280,6 +2628,7 @@ 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
@@ -2289,11 +2638,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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"
@@ -2304,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"
@@ -2319,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"
@@ -2335,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: % 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"
@@ -2395,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"
@@ -2422,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"
@@ -2444,21 +2872,34 @@ 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 ""
@@ -2468,16 +2909,35 @@ 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 ""
+
+#: src/utils/pactl.c:1718
+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 "
@@ -2488,11 +2948,16 @@ 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 ""
@@ -2550,10 +3015,70 @@ msgid "card"
msgstr ""
#: src/utils/pactl.c:1427
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr ""
+
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr ""
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr ""
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr ""
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr ""
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr ""
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr ""
+
+#: src/utils/pactl.c:2167
+msgid "sink-input"
+msgstr ""
+
+#: src/utils/pactl.c:2170
+msgid "source-output"
+msgstr ""
+
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr ""
+
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr ""
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr ""
+
+#: src/utils/pactl.c:2182
+msgid "server"
+msgstr ""
+
+#: 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 ""
@@ -2619,6 +3144,73 @@ msgid "#N FORMATS"
msgstr ""
#: src/utils/pactl.c:1865
+=======
+#: src/utils/pactl.c:2514
+msgid "Got SIGINT, exiting."
+msgstr ""
+
+#: src/utils/pactl.c:2547
+msgid "Invalid volume specification"
+msgstr ""
+
+#: src/utils/pactl.c:2581
+msgid "Volume outside permissible range.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2594
+msgid "Invalid number of volume specifications.\n"
+msgstr ""
+
+#: src/utils/pactl.c:2606
+msgid "Inconsistent volume specification.\n"
+msgstr ""
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr ""
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr ""
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr ""
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr ""
+
+#: src/utils/pactl.c:2653
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2654
+msgid "#N VOLUME [VOLUME ...]"
+msgstr ""
+
+#: src/utils/pactl.c:2655
+msgid "NAME|#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2656
+msgid "#N 1|0|toggle"
+msgstr ""
+
+#: src/utils/pactl.c:2657
+msgid "#N FORMATS"
+msgstr ""
+
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -2626,20 +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"
@@ -2647,11 +3252,21 @@ 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 ""
@@ -2689,20 +3304,68 @@ 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 ""
+
+#: src/utils/pactl.c:2801
+msgid "Failed to open sound file."
+msgstr ""
+
+#: src/utils/pactl.c:2813
+msgid "Warning: Failed to determine sample specification from file."
+msgstr ""
+
+#: src/utils/pactl.c:2823
+msgid "You have to specify a sample name to play"
+msgstr ""
+
+#: src/utils/pactl.c:2835
+msgid "You have to specify a sample name to remove"
+msgstr ""
+
+#: src/utils/pactl.c:2844
+msgid "You have to specify a sink input index and a sink"
+msgstr ""
+
+#: src/utils/pactl.c:2854
+msgid "You have to specify a source output index and a source"
+msgstr ""
+
+#: src/utils/pactl.c:2869
+msgid "You have to specify a module name and arguments."
+msgstr ""
+
+#: src/utils/pactl.c:2889
+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 ""
@@ -2756,35 +3419,112 @@ 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 ""
+
+#: src/utils/pactl.c:2950
+msgid "You have to specify a sink name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2961
+msgid "You have to specify a sink name"
+msgstr ""
+
+#: src/utils/pactl.c:2974
+msgid "You have to specify a source name/index and a port name"
+msgstr ""
+
+#: src/utils/pactl.c:2985
+msgid "You have to specify a source name"
+msgstr ""
+
+#: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+msgid "You have to specify a sink name/index"
+msgstr ""
+
+#: 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
+msgid "You have to specify a source name/index"
+msgstr ""
+
+#: src/utils/pactl.c:3031
+msgid "You have to specify a source name/index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3044
+msgid "You have to specify a sink input index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3049
+msgid "Invalid sink input index"
+msgstr ""
+
+#: src/utils/pactl.c:3060
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+
+#: src/utils/pactl.c:3065
+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 ""
@@ -2794,17 +3534,33 @@ 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 ""
+
+#: src/utils/pactl.c:3162
+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 ""
@@ -2814,6 +3570,17 @@ 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 ""
+
+#: 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/es.po b/po/es.po
index 2c0b1790f..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 \n"
"Language-Team: Spanish \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,7 @@ msgid ""
msgstr ""
"%s [opciones]\n"
"\n"
+<<<<<<< HEAD
"COMANDOS:\n"
" -h, --help Muestra esta ayuda\n"
" --version Muestra la versión\n"
@@ -143,28 +153,68 @@ msgstr ""
"tras\n"
" ese tiempo de inactividad\n"
" --log-level[=NIVEL] Aumenta o modifica el nivel de "
-"registro\n"
-" -v --verbose Aumenta el nivel de registro\n"
-" --log-target={auto,syslog,stderr,file:RUTA,newfile:RUTA}\n"
-" Indica dónde realizar el registro\n"
-" --log-meta[=BOOL] Incluye en el registro el punto del\n"
-" código\n"
-" --log-time[=BOOL] Incluye en el registro marcas de "
-"tiempo\n"
-" --log-backtrace=LOTES Incluye en el registro una traza\n"
-" -p, --dl-search-path=RUTA Indica la ruta de búsqueda de "
-"objetos\n"
-" dinámicos (complementos)\n"
-" --resample-method=MÉTODO Usa MÉTODO para remuestreo\n"
-" (Vea --dump-resample-methods para "
-"los\n"
-" posibles valores)\n"
-" --use-pid-file[=BOOL] Crea un archivo PID\n"
-" --no-cpu-limit[=BOOL] No instala el limitador de carga de "
-"CPU\n"
-" en las plataformas que lo permiten\n"
-" --disable-shm[=BOOL] Desactiva la memoria compartida\n"
+=======
+"ÓRDENES:\n"
+" -h, --help Mostrar esta ayuda\n"
+" --version Mostrar la versión\n"
+" --dump-conf Volcar la configuración por defecto\n"
+" --dump-modules Volcar la lista de módulos "
+"disponibles\n"
+" --dump-resample-methods Volcar los métodos de remuestreo "
+"disponibles\n"
+" --cleanup-shm Limpiar los segmentos de memoria "
+"compartida obsoletos\n"
+" --start Iniciar el servicio si no se está "
+"ejecutando\n"
+" -k --kill Matar un servicio en ejecución\n"
+" --check Comprobar si hay un servicio en "
+"ejecución\n"
+" (solo devuelve el código de salida)\n"
"\n"
+"OPCIONES:\n"
+" --system[=BOOL] Ejecutar como una instancia del "
+"sistema\n"
+" -D, --daemonize[=BOOL] Convertir en un servicio después del "
+"inicio\n"
+" --fail[=BOOL] Salir cuando falla el inicio\n"
+" --high-priority[=BOOL] Intentar asignar una prioridad alta\n"
+" (solo disponible como superusuario, "
+"con SUID\n"
+" o con un valor RLIMIT_NICE elevado)\n"
+" --realtime[=BOOL] Intentar activar la programación en "
+"tiempo real\n"
+" (solo disponible como superusuario, "
+"con SUID o\n"
+" con un valor RLIMIT_RTPRIO elevado)\n"
+" --disallow-module-loading[=BOOL] Denegar la carga/descarga de módulos "
+"a petición\n"
+" del usuario tras el inicio\n"
+" --disallow-exit[=BOOL] Denegar la salida a petición del "
+"usuario\n"
+" --exit-idle-time=SEGUNDOS Finalizar el servicio cuando esté "
+"inactivo y\n"
+" haya pasado este tiempo\n"
+" --scache-idle-time=SEGUNDOS Descargar las muestras cargadas "
+"automáticamente\n"
+" 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"
+" Especificar el destino del registro\n"
+" --log-meta[=BOOL] Incluir ubicaciones del código en el "
+"registro\n"
+" --log-time[=BOOL] Incluir marcas de tiempo en el "
+"registro\n"
+" --log-backtrace=MARCOS Incluir trazados de pila en el "
+"registro\n"
+" -p, --dl-search-path=RUTA Configurar la ruta de búsqueda de "
+"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"
@@ -175,6 +225,31 @@ msgstr ""
"\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"
+" --dump-resample-methods)\n"
+" --use-pid-file[=BOOL] Crear un archivo PID\n"
+" --no-cpu-limit[=BOOL] No instalar el limitador de carga de "
+"la CPU\n"
+" en las plataformas compatibles.\n"
+" --disable-shm[=BOOL] Desactivar el uso de memoria "
+"compartida\n"
+" --enable-memfd[=BOOL] Activar el uso de memoria compartida "
+"memfd\n"
+"\n"
+"GUION DE INICIO:\n"
+" -L, --load=\"ARGUMENTO DEL MÓDULO\" Cargar el módulo del complemento "
+"especificado\n"
+" con el argumento especificado\n"
+" -F, --file=ARCHIVO Ejecutar el guion especificado\n"
+" -C Abrir una línea de órdenes en el TTY "
+"en\n"
+" 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"
@@ -187,11 +262,17 @@ msgstr "--fail espera un 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)."
+"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"
@@ -218,8 +299,13 @@ msgid ""
"Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a "
"valid file name 'file:', 'newfile:'."
msgstr ""
+<<<<<<< HEAD
"El objetivo del registro no es válido; use «syslog», «journal», «stderr», "
"«auto» o un nombre de archivo válido con «file:» o «newfile:»."
+=======
+"El destino del registro no es válido; use 'syslog', 'journal', 'stderr', "
+"'auto' o un nombre de archivo válido con 'file:' o 'newfile:'."
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/daemon/cmdline.c:330
msgid ""
@@ -227,7 +313,7 @@ msgid ""
"name 'file:', 'newfile:'."
msgstr ""
"El tipo de registro no es válido; use 'syslog', 'stderr', 'auto' o un nombre "
-"de fichero válido con 'file:' o 'newfile:'."
+"de archivo válido con 'file:' o 'newfile:'."
#: src/daemon/cmdline.c:338
msgid "--log-time expects boolean argument"
@@ -240,7 +326,7 @@ msgstr "--log-meta espera un argumento booleano"
#: src/daemon/cmdline.c:366
#, c-format
msgid "Invalid resample method '%s'."
-msgstr "Método de remuestreo inválido '%s'"
+msgstr "Método de remuestreo no válido '%s'."
#: src/daemon/cmdline.c:373
msgid "--system expects boolean argument"
@@ -261,67 +347,67 @@ msgstr "--enable-memfd espera un argumento booleano"
#: src/daemon/daemon-conf.c:270
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
-msgstr "[%s:%u] Destino de log inválido '%s'."
+msgstr "[%s:%u] Destino del registro no válido '%s'."
#: src/daemon/daemon-conf.c:285
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
-msgstr "[%s:%u] Nivel de log inválido '%s'."
+msgstr "[%s:%u] Nivel de registro no válido '%s'."
#: src/daemon/daemon-conf.c:300
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
-msgstr "[%s:%u] Método de remuestreo inválido '%s'."
+msgstr "[%s:%u] Método de remuestreo no válido '%s'."
#: src/daemon/daemon-conf.c:322
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr "[%s:%u] Rlimit inválido '%s'."
+msgstr "[%s:%u] rlimit no válido '%s'."
#: src/daemon/daemon-conf.c:342
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
-msgstr "[%s:%u] Formato de muestra inválido '%s'."
+msgstr "[%s:%u] Formato de muestra no vá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] Tasa de muestra inválida '%s'."
+msgstr "[%s:%u] Tasa de muestreo no válida '%s'."
#: src/daemon/daemon-conf.c:399
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
-msgstr "[%s:%u] Canales de muestra inválidos '%s'."
+msgstr "[%s:%u] Canales de muestreo no válidos '%s'."
#: src/daemon/daemon-conf.c:416
#, c-format
msgid "[%s:%u] Invalid channel map '%s'."
-msgstr "[%s:%u] Mapa de canal inválido '%s'."
+msgstr "[%s:%u] Mapa de canales no válidos '%s'."
#: src/daemon/daemon-conf.c:433
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
-msgstr "[%s:%u] Cantidad de fragmentoa inválidos '%s'."
+msgstr "[%s:%u] Número de fragmentos no válidos '%s'."
#: src/daemon/daemon-conf.c:450
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr "[%s:%u] Tamaño inválido de fragmento '%s'."
+msgstr "[%s:%u] Tamaño de fragmento no válido '%s'."
#: src/daemon/daemon-conf.c:467
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
-msgstr "[%s:%u] Nivel de nice inválido '%s'."
+msgstr "[%s:%u] Nivel de prioridad no válido '%s'."
#: src/daemon/daemon-conf.c:552
#, c-format
msgid "[%s:%u] Invalid server type '%s'."
-msgstr "[%s:%u] Tipo de servidor incorrecto: '%s'."
+msgstr "[%s:%u] Tipo de servidor no válido: '%s'."
#: src/daemon/daemon-conf.c:685
#, c-format
msgid "Failed to open configuration file: %s"
-msgstr "No se pudo abrir el archivo de configuración: %s"
+msgstr "Error al abrir el archivo de configuración: %s"
#: src/daemon/daemon-conf.c:701
msgid ""
@@ -334,7 +420,7 @@ msgstr ""
#: src/daemon/daemon-conf.c:788
#, c-format
msgid "### Read from configuration file: %s ###\n"
-msgstr "### Leyendo desde el archivo de confioguración: %s ###\n"
+msgstr "### Leyendo desde el archivo de configuración: %s ###\n"
#: src/daemon/dumpmodules.c:57
#, c-format
@@ -344,7 +430,7 @@ msgstr "Nombre: %s\n"
#: src/daemon/dumpmodules.c:60
#, c-format
msgid "No module information available\n"
-msgstr "No existe información disponible acerca del módulo\n"
+msgstr "No hay información disponible sobre el módulo\n"
#: src/daemon/dumpmodules.c:63
#, c-format
@@ -384,29 +470,29 @@ msgstr "Ruta: %s\n"
#: src/daemon/ltdl-bind-now.c:75
#, c-format
msgid "Failed to open module %s: %s"
-msgstr "No se pudo abrir el módulo %s: %s"
+msgstr "Error al abrir el módulo %s: %s"
#: src/daemon/ltdl-bind-now.c:126
msgid "Failed to find original lt_dlopen loader."
-msgstr "Falló al buscar cargador el cargador lt_dlopen original."
+msgstr "Error al buscar el cargador lt_dlopen original."
#: src/daemon/ltdl-bind-now.c:131
msgid "Failed to allocate new dl loader."
-msgstr "Falló al asignar el cargador dl nuevo."
+msgstr "Error al asignar el cargador dl nuevo."
#: src/daemon/ltdl-bind-now.c:144
msgid "Failed to add bind-now-loader."
-msgstr "Falló al agregar bind-now-loader."
+msgstr "Error al añadir bind-now-loader."
#: src/daemon/main.c:265
#, c-format
msgid "Failed to find user '%s'."
-msgstr "Falló al buscar usuario '%s'."
+msgstr "Error al encontrar el usuario '%s'."
#: src/daemon/main.c:270
#, c-format
msgid "Failed to find group '%s'."
-msgstr "Falló al buscar grupo '%s'."
+msgstr "Error al encontrar el grupo '%s'."
#: src/daemon/main.c:279
#, c-format
@@ -421,22 +507,22 @@ msgstr "El directorio de inicio del usuario '%s' no es '%s', ignorando."
#: src/daemon/main.c:287 src/daemon/main.c:292
#, c-format
msgid "Failed to create '%s': %s"
-msgstr "Falló al crear '%s': %s"
+msgstr "Error al crear '%s': %s"
#: src/daemon/main.c:299
#, c-format
msgid "Failed to change group list: %s"
-msgstr "Falló al cambiar la lista de grupo: %s"
+msgstr "Error al cambiar la lista del grupo: %s"
#: src/daemon/main.c:315
#, c-format
msgid "Failed to change GID: %s"
-msgstr "Falló al cambiar GID: %s"
+msgstr "Error al cambiar el GID: %s"
#: src/daemon/main.c:331
#, c-format
msgid "Failed to change UID: %s"
-msgstr "Falló al cambiar UID: %s"
+msgstr "Error al cambiar el UID: %s"
#: src/daemon/main.c:360
msgid "System wide mode unsupported on this platform."
@@ -444,28 +530,28 @@ msgstr "El modo a nivel de sistema no es soportado en esta plataforma."
#: src/daemon/main.c:650
msgid "Failed to parse command line."
-msgstr "Falló al analizar la línea de comando."
+msgstr "Error al analizar la línea de órdenes."
#: src/daemon/main.c:689
msgid ""
"System mode refused for non-root user. Only starting the D-Bus server lookup "
"service."
msgstr ""
-"Denegado el modo de sistema para usuario que no es administrador. Sólo se "
-"inicia el servicio de búsqueda de servidor D-Bus."
+"Modo de sistema rechazado para un usuario sin permisos. Se inicia solo el "
+"servicio de búsqueda del servidor D-Bus."
#: src/daemon/main.c:788
#, c-format
msgid "Failed to kill daemon: %s"
-msgstr "No se ha podido detener el demonio: %s"
+msgstr "Error al detener el servicio: %s"
#: src/daemon/main.c:817
msgid ""
"This program is not intended to be run as root (unless --system is "
"specified)."
msgstr ""
-"Este programa no tiene por qué ser ejecutado como root (a menos que --system "
-"sea especificado)."
+"Este programa no se ejecutará como superusuario (a menos que se especifique "
+"--system)."
#: src/daemon/main.c:820
msgid "Root privileges required."
@@ -490,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
@@ -510,35 +604,35 @@ msgstr ""
#: src/daemon/main.c:922
msgid "Failed to acquire stdio."
-msgstr "Fallo al intentar adquirir stdio."
+msgstr "Error al adquirir la stdio."
#: src/daemon/main.c:928 src/daemon/main.c:999
#, c-format
msgid "pipe() failed: %s"
-msgstr "Falló la llamada a pipe(): %s"
+msgstr "Ha fallado pipe(): %s"
#: src/daemon/main.c:933 src/daemon/main.c:1004
#, c-format
msgid "fork() failed: %s"
-msgstr "Falló el fork(): %s"
+msgstr "Ha fallado fork(): %s"
#: src/daemon/main.c:948 src/daemon/main.c:1019 src/utils/pacat.c:562
#, c-format
msgid "read() failed: %s"
-msgstr "Falló la operación read(): %s"
+msgstr "Ha fallado read(): %s"
#: src/daemon/main.c:954
msgid "Daemon startup failed."
-msgstr "Falló el inicio del demonio. "
+msgstr "Ha fallado el inicio del servicio."
#: src/daemon/main.c:987
#, c-format
msgid "setsid() failed: %s"
-msgstr "Falló la operación setsid(): %s"
+msgstr "Ha fallado setsid(): %s"
#: src/daemon/main.c:1119
msgid "Failed to get machine ID"
-msgstr "Fallo al intentar obtener el ID de la máquina"
+msgstr "Error al obtener el ID de la máquina"
#: src/daemon/main.c:1145
msgid ""
@@ -560,7 +654,7 @@ msgstr "Ha fallado pa_pid_file_create()."
#: src/daemon/main.c:1193
msgid "pa_core_new() failed."
-msgstr "Falló pa_core_new()."
+msgstr "Ha fallado pa_core_new()."
#: src/daemon/main.c:1268
msgid "command line arguments"
@@ -578,16 +672,16 @@ msgstr ""
#: src/daemon/main.c:1280
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
-"El demonio se ha iniciado sin ningún módulo cargado, y por ello se niega a "
+"El servicio se ha iniciado sin ningún módulo cargado y por ello se niega a "
"funcionar."
#: src/daemon/pulseaudio.desktop.in:4
msgid "PulseAudio Sound System"
-msgstr "Sistema de Sonido PulseAudio"
+msgstr "Sistema de sonido PulseAudio"
#: src/daemon/pulseaudio.desktop.in:5
msgid "Start the PulseAudio Sound System"
-msgstr "Iniciar el Sistema de Sonido PulseAudio"
+msgstr "Iniciar el sistema de sonido PulseAudio"
#: src/modules/alsa/alsa-mixer.c:2708
msgid "Input"
@@ -595,22 +689,26 @@ msgstr "Entrada"
#: src/modules/alsa/alsa-mixer.c:2709
msgid "Docking Station Input"
-msgstr "Entrada de estación de acoplamiento"
+msgstr "Entrada de la estación de acoplamiento"
#: src/modules/alsa/alsa-mixer.c:2710
msgid "Docking Station Microphone"
-msgstr "Micrófono de estación de acoplamiento"
+msgstr "Micrófono de la estación de acoplamiento"
#: src/modules/alsa/alsa-mixer.c:2711
msgid "Docking Station Line In"
-msgstr "Línea de entrada de estación de acoplamiento"
+msgstr "Entrada de línea de la estación de acoplamiento"
#: src/modules/alsa/alsa-mixer.c:2712 src/modules/alsa/alsa-mixer.c:2803
msgid "Line In"
-msgstr "Línea de entrada"
+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"
@@ -631,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"
@@ -650,11 +756,11 @@ msgstr "Sin control automático de ganancia"
#: src/modules/alsa/alsa-mixer.c:2722
msgid "Boost"
-msgstr "Incremento de ganancia"
+msgstr "Refuerzo"
#: src/modules/alsa/alsa-mixer.c:2723
msgid "No Boost"
-msgstr "Sin incremento de ganancia"
+msgstr "Sin refuerzo"
#: src/modules/alsa/alsa-mixer.c:2724
msgid "Amplifier"
@@ -666,19 +772,27 @@ msgstr "Sin amplificador"
#: src/modules/alsa/alsa-mixer.c:2726
msgid "Bass Boost"
-msgstr "Potenciador de graves"
+msgstr "Refuerzo de graves"
#: src/modules/alsa/alsa-mixer.c:2727
msgid "No Bass Boost"
-msgstr "Sin potenciador de graves"
+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"
@@ -688,11 +802,11 @@ msgstr "Entrada analógica"
#: src/modules/alsa/alsa-mixer.c:2800
msgid "Dock Microphone"
-msgstr "Micrófono de estación de acoplamiento"
+msgstr "Micrófono de la estación de acoplamiento"
#: src/modules/alsa/alsa-mixer.c:2802
msgid "Headset Microphone"
-msgstr "Micrófono acoplado a auriculares"
+msgstr "Micrófono de los auriculares"
#: src/modules/alsa/alsa-mixer.c:2806
msgid "Analog Output"
@@ -704,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"
@@ -712,7 +830,7 @@ msgstr "Línea de salida"
#: src/modules/alsa/alsa-mixer.c:2811
msgid "Analog Mono Output"
-msgstr "Salida mono analógica "
+msgstr "Salida mono analógica"
#: src/modules/alsa/alsa-mixer.c:2812
msgid "Speakers"
@@ -720,7 +838,7 @@ msgstr "Altavoces"
#: src/modules/alsa/alsa-mixer.c:2813
msgid "HDMI / DisplayPort"
-msgstr "HDMI / DisplayPort"
+msgstr "HDMI/DisplayPort"
#: src/modules/alsa/alsa-mixer.c:2814
msgid "Digital Output (S/PDIF)"
@@ -740,6 +858,7 @@ 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
@@ -753,6 +872,21 @@ 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
+msgid "Chat Output"
+msgstr "Salida de chat"
+
+#: src/modules/alsa/alsa-mixer.c:2821
+msgid "Chat Input"
+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"
@@ -786,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"
@@ -816,7 +954,7 @@ msgstr "Envolvente analógico 4.0"
#: src/modules/alsa/alsa-mixer.c:4584
msgid "Analog Surround 4.1"
-msgstr "Envolvente análogico 4.1"
+msgstr "Envolvente analógico 4.1"
#: src/modules/alsa/alsa-mixer.c:4585
msgid "Analog Surround 5.0"
@@ -876,15 +1014,15 @@ msgstr "Juego"
#: src/modules/alsa/alsa-mixer.c:4732
msgid "Analog Mono Duplex"
-msgstr "Mono analógico dúplex"
+msgstr "Dúplex mono analógico"
#: src/modules/alsa/alsa-mixer.c:4733
msgid "Analog Stereo Duplex"
-msgstr "Estéreo analógico dúplex"
+msgstr "Dúplex estéreo analógico"
#: src/modules/alsa/alsa-mixer.c:4736
msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Estéreo digital dúplex (IEC958)"
+msgstr "Dúplex estéreo digital (IEC958)"
#: src/modules/alsa/alsa-mixer.c:4737
msgid "Multichannel Duplex"
@@ -894,12 +1032,29 @@ msgstr "Dúplex multicanal"
msgid "Stereo Duplex"
msgstr "Dúplex estéreo"
+#: src/modules/alsa/alsa-mixer.c:4739
+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"
@@ -913,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 "
@@ -923,6 +1082,7 @@ 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 "
@@ -931,6 +1091,16 @@ msgstr ""
"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 "
+"este problema a los desarrolladores de ALSA.\n"
+"Nos despertaron con POLLOUT activado, sin embargo, la llamada a "
+"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 "
@@ -940,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
@@ -962,6 +1141,7 @@ 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] ""
@@ -969,6 +1149,15 @@ msgstr[1] ""
"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] ""
+"snd_pcm_avail() ha devuelto un valor excepcionalmente grande: %lu bytes (%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:1249
#, c-format
@@ -983,6 +1172,7 @@ 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 "
@@ -992,6 +1182,17 @@ msgstr[1] ""
"%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 "
+"este problema a los desarrolladores de ALSA."
+msgstr[1] ""
+"snd_pcm_delay() ha devuelto un valor excepcionalmente grande: %li bytes ("
+"%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
@@ -1019,6 +1220,7 @@ 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 "
@@ -1085,6 +1287,74 @@ 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 "
+"este problema a los desarrolladores de ALSA."
+msgstr[1] ""
+"snd_pcm_mmap_begin() ha devuelto un valor excepcionalmente grande: %lu bytes "
+"(%lu ms).\n"
+"Probablemente se trata de un error en el controlador ALSA «%s». Informe de "
+"este problema a los desarrolladores de ALSA."
+
+#: src/modules/bluetooth/module-bluez5-device.c:1937
+#: src/modules/bluetooth/module-bluez5-device.c:1963
+#: src/modules/bluetooth/module-bluez5-device.c:1970
+msgid "Bluetooth Input"
+msgstr "Entrada bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr "Salida bluetooth"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr "Manos libres"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr "Auriculares"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr "Portátil"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr "Coche"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr "Alta fidelidad"
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr "Teléfono"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "Reproducción de alta fidelidad (destino A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "Captura de alta fidelidad (fuente A2DP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+msgid "Headset Head Unit (HSP)"
+msgstr "Auriculares con micrófono (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr "Pasarela de audio para auriculares (HSP)"
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+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)"
@@ -1102,6 +1372,7 @@ msgid ""
"or no> "
msgstr ""
"source_name= source_properties= source_master= sink_name= sink_properties= "
"sink_master= adjust_time= save_aec= autoloaded= use_volume_sharing= "
"use_master_format= "
+=======
+"fuente> source_master= sink_name= sink_properties= "
+"sink_master= adjust_time= adjust_threshold= format= rate= channels= channel_map= "
+"aec_method= aec_args= "
+"save_aec= autoloaded= use_volume_sharing= use_master_format= "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#. add on profile
#: src/modules/macosx/module-coreaudio-device.c:825
@@ -1121,15 +1404,23 @@ 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"
-msgstr "Mantiene siempre un destino activo aunque sea el nulo"
+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"
@@ -1144,12 +1435,17 @@ msgid ""
msgstr ""
"sink_name= sink_properties= sink_master= format= "
-"rate= channels= channel_map= autoloaded= use_volume_sharing="
+"rate= channels= channel_map= 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 "Ecualizador basado en FFT en %s"
@@ -1175,6 +1471,7 @@ msgid ""
"is being loaded automatically> "
msgstr ""
"sink_name= sink_properties= master= format= rate= channels= "
"channel_map= plugin= output_ladspaport_map= autoloaded= "
+=======
+"destino> master= format= "
+"rate= channels= channel_map= plugin= "
+"label= control= input_ladspaport_map= "
+"output_ladspaport_map= autoloaded= "
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#: src/modules/module-null-sink.c:46
msgid "Clocked NULL sink"
-msgstr "Sumidero nulo sincronizado"
+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"
+msgstr "Salida nula"
+#: src/modules/module-null-sink.c:368 src/utils/pactl.c:2064
+#, c-format
+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
@@ -1216,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"
@@ -1242,23 +1572,42 @@ msgid ""
"left_hrir.wav hrir_right=/path/to/optional/right_hrir.wav autoloaded= "
msgstr ""
+<<<<<<< HEAD
"sink_name= sink_properties= master= format= rate= channels= "
"channel_map= use_volume_sharing= "
"force_flat_volume= hrir=/ruta/a/left_hrir.wav "
+=======
+"sink_name= sink_properties= "
+"master= sink_master= format= rate= "
+"channels= channel_map= "
+"use_volume_sharing= force_flat_volume= hrir=/ruta/a/"
+"left_hrir. wav hrir_left=/ruta/a/left_hrir.wav hrir_right=/ruta/a/opcional/"
+"right_hrir.wav autoloaded= "
+>>>>>>> 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"
@@ -1274,27 +1623,27 @@ msgstr "Frontal derecho"
#: src/pulse/channelmap.c:109
msgid "Rear Center"
-msgstr "Posterior central"
+msgstr "Trasero central"
#: src/pulse/channelmap.c:110
msgid "Rear Left"
-msgstr "Posterior izquierdo"
+msgstr "Trasero izquierdo"
#: src/pulse/channelmap.c:111
msgid "Rear Right"
-msgstr "Posterior derecho"
+msgstr "Trasero derecho"
#: src/pulse/channelmap.c:113
msgid "Subwoofer"
-msgstr "Subwoofer"
+msgstr "Altavoz de subgraves"
#: src/pulse/channelmap.c:115
msgid "Front Left-of-center"
-msgstr "Frontal a la izquierda del central"
+msgstr "Frontal izquierdo del centro"
#: src/pulse/channelmap.c:116
msgid "Front Right-of-center"
-msgstr "Frontal a la derecha del central"
+msgstr "Frontal derecho del centro"
#: src/pulse/channelmap.c:118
msgid "Side Left"
@@ -1434,37 +1783,41 @@ msgstr "Auxiliar 31"
#: src/pulse/channelmap.c:154
msgid "Top Center"
-msgstr "Central superior"
+msgstr "Superior central"
#: src/pulse/channelmap.c:156
msgid "Top Front Center"
-msgstr "Frontal superior central"
+msgstr "Superior frontal central"
#: src/pulse/channelmap.c:157
msgid "Top Front Left"
-msgstr "Frontal superior izquierdo"
+msgstr "Superior frontal izquierdo"
#: src/pulse/channelmap.c:158
msgid "Top Front Right"
-msgstr "Frontal superior derecho"
+msgstr "Superior frontal derecho"
#: src/pulse/channelmap.c:160
msgid "Top Rear Center"
-msgstr "Posterior central superior "
+msgstr "Superior trasero central"
#: src/pulse/channelmap.c:161
msgid "Top Rear Left"
-msgstr "Posterior izquierdo superior"
+msgstr "Superior trasero izquierdo"
#: src/pulse/channelmap.c:162
msgid "Top Rear Right"
-msgstr "Posterior derecho superior"
+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 "(inválido)"
+msgstr "(no válido)"
#: src/pulse/channelmap.c:779
msgid "Surround 4.0"
@@ -1488,7 +1841,7 @@ msgstr "Envolvente 7.1"
#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
msgid "xcb_connect() failed"
-msgstr "Falló xcb_connect()"
+msgstr "Ha fallado xcb_connect()"
#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
msgid "xcb_connection_has_error() returned true"
@@ -1496,7 +1849,7 @@ msgstr "xcb_connection_has_error() indica error"
#: src/pulse/client-conf-x11.c:102
msgid "Failed to parse cookie data"
-msgstr "Fallo al analizar los datos de la cookie"
+msgstr "Error al analizar los datos de la cookie"
#: src/pulse/context.c:717
#, c-format
@@ -1527,7 +1880,7 @@ msgstr "bidireccional"
#: src/pulse/direction.c:43
msgid "invalid"
-msgstr "inválido"
+msgstr "no válido"
#: src/pulsecore/core-util.c:1790
#, c-format
@@ -1537,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"
@@ -1556,25 +1915,33 @@ msgstr "No se puede acceder al bloqueo de autogeneración."
#: src/pulsecore/log.c:165
#, c-format
msgid "Failed to open target file '%s'."
-msgstr "No se pudo abrir el archivo de destino '%s'"
+msgstr "Error al abrir el archivo de destino '%s'."
#: src/pulsecore/log.c:188
#, c-format
msgid ""
"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
msgstr ""
-"Se intentó abrir los archivos de destino '%s', '%s.1', '%s.2' ... '%s.%d', "
-"pero todos fallaron."
+"Se ha intentado abrir los archivos de destino '%s', '%s.1', '%s.2' ... "
+"'%s.%d', pero todos los intentos fallaron."
#: src/pulsecore/log.c:651
msgid "Invalid log target."
-msgstr "El destino de registro no es válido."
+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"
@@ -1592,7 +1959,7 @@ msgstr "Comando desconocido"
#: src/pulse/error.c:41
msgid "Invalid argument"
-msgstr "Argumento inválido"
+msgstr "Argumento no válido"
#: src/pulse/error.c:42
msgid "Entity exists"
@@ -1604,7 +1971,7 @@ msgstr "No existe tal entidad"
#: src/pulse/error.c:44
msgid "Connection refused"
-msgstr "Conexión negada"
+msgstr "Conexión rechazada"
#: src/pulse/error.c:45
msgid "Protocol error"
@@ -1632,11 +1999,11 @@ msgstr "Entidad terminada"
#: src/pulse/error.c:51
msgid "Invalid server"
-msgstr "Servidor inválido"
+msgstr "Servidor no válido"
#: src/pulse/error.c:52
msgid "Module initialization failed"
-msgstr "Falló la inicialización del módulo"
+msgstr "Ha fallado la inicialización del módulo"
#: src/pulse/error.c:53
msgid "Bad state"
@@ -1680,7 +2047,7 @@ msgstr "Cliente iniciado"
#: src/pulse/error.c:63
msgid "Input/Output error"
-msgstr "Error de Entrada/Salida"
+msgstr "Error de entrada/salida"
#: src/pulse/error.c:64
msgid "Device or resource busy"
@@ -1714,11 +2081,11 @@ msgstr "%u B"
#: src/utils/pacat.c:134
#, c-format
msgid "Failed to drain stream: %s"
-msgstr "Falló al drenar el flujo: %s"
+msgstr "Error al volcar la transmisión: %s"
#: src/utils/pacat.c:139
msgid "Playback stream drained."
-msgstr "El flujo de reproducción ha sido drenado."
+msgstr "Se ha vaciado el flujo de reproducción."
#: src/utils/pacat.c:150
msgid "Draining connection to server."
@@ -1732,21 +2099,21 @@ msgstr "pa_stream_drain(): %s"
#: src/utils/pacat.c:194 src/utils/pacat.c:543
#, c-format
msgid "pa_stream_begin_write() failed: %s"
-msgstr "pa_stream_write() falló: %s"
+msgstr "Ha fallado pa_stream_write(): %s"
#: src/utils/pacat.c:244 src/utils/pacat.c:274
#, c-format
msgid "pa_stream_peek() failed: %s"
-msgstr "pa_stream_peek() falló: %s"
+msgstr "Ha fallado pa_stream_peek(): %s"
#: src/utils/pacat.c:324
msgid "Stream successfully created."
-msgstr "Se ha creado exitosamente el flujo (stream)."
+msgstr "La transmisión se ha creado correctamente."
#: src/utils/pacat.c:327
#, c-format
msgid "pa_stream_get_buffer_attr() failed: %s"
-msgstr "pa_stream_get_buffer_attr() falló: %s"
+msgstr "Ha fallado pa_stream_get_buffer_attr(): %s"
#: src/utils/pacat.c:331
#, c-format
@@ -1761,7 +2128,7 @@ msgstr "Métrica del búfer: maxlenght=%u, fragsize=%u"
#: src/utils/pacat.c:338
#, c-format
msgid "Using sample spec '%s', channel map '%s'."
-msgstr "Utilizando especificaciones de muestra '%s', mapa del canal '%s'."
+msgstr "Usando especificación de muestra '%s', mapa de canales' %s'."
#: src/utils/pacat.c:342
#, c-format
@@ -1771,54 +2138,54 @@ msgstr "Conectado al dispositivo %s (índice %u, suspensión %s)."
#: src/utils/pacat.c:352
#, c-format
msgid "Stream error: %s"
-msgstr "Error de flujo: %s"
+msgstr "Error de transmisión: %s"
#: src/utils/pacat.c:362
#, c-format
msgid "Stream device suspended.%s"
-msgstr "Dispositivo de flujo suspendido.%s"
+msgstr "Dispositivo de transmisión suspendido.%s"
#: src/utils/pacat.c:364
#, c-format
msgid "Stream device resumed.%s"
-msgstr "Dispositivo de flujo reestablecido.%s"
+msgstr "Dispositivo de transmisión restablecido.%s"
#: src/utils/pacat.c:372
#, c-format
msgid "Stream underrun.%s"
-msgstr "Flujo agotado.%s"
+msgstr "Insuficiencia de datos en la transmisión.%s"
#: src/utils/pacat.c:379
#, c-format
msgid "Stream overrun.%s"
-msgstr "Flujo saturado.%s"
+msgstr "Exceso de datos en la transmisión.%s"
#: src/utils/pacat.c:386
#, c-format
msgid "Stream started.%s"
-msgstr "Flujo iniciado.%s"
+msgstr "Transmisión iniciada.%s"
#: src/utils/pacat.c:393
#, c-format
msgid "Stream moved to device %s (%u, %ssuspended).%s"
-msgstr "Fujo trasladado al dispositivo %s (%u, %ssuspended).%s"
+msgstr "Transmisión movida al dispositivo %s (%u, %sen suspenso).%s"
#: src/utils/pacat.c:393
msgid "not "
-msgstr "no"
+msgstr "no "
#: src/utils/pacat.c:400
#, c-format
msgid "Stream buffer attributes changed.%s"
-msgstr "Los atributos del búfer de flujo han cambiado.%s"
+msgstr "Se han modificado los atributos del búfer de transmisión.%s"
#: src/utils/pacat.c:415
msgid "Cork request stack is empty: corking stream"
-msgstr "La pila de peticiones de pausa está vacía: pausando flujo"
+msgstr "La pila de peticiones de pausa está vacía: pausando la transmisión"
#: src/utils/pacat.c:421
msgid "Cork request stack is empty: uncorking stream"
-msgstr "La pila de peticiones de pausa está vacía: reactivando flujo"
+msgstr "La pila de peticiones de pausa está vacía: reactivando la transmisión"
#: src/utils/pacat.c:425
msgid "Warning: Received more uncork requests than cork requests."
@@ -1832,27 +2199,31 @@ msgstr "Conexión establecida.%s"
#: src/utils/pacat.c:453
#, c-format
msgid "pa_stream_new() failed: %s"
-msgstr "pa_stream_new() falló: %s"
+msgstr "Ha fallado pa_stream_new(): %s"
#: src/utils/pacat.c:491
#, c-format
msgid "pa_stream_connect_playback() failed: %s"
-msgstr "pa_stream_connect_playback() falló: %s"
+msgstr "Ha fallado pa_stream_connect_playback(): %s"
#: src/utils/pacat.c:497
#, c-format
msgid "Failed to set monitor stream: %s"
-msgstr "No se pudo aplicar el flujo de monitorización: %s"
+msgstr "Error al configurar la transmisión del monitor: %s"
#: src/utils/pacat.c:501
#, c-format
msgid "pa_stream_connect_record() failed: %s"
-msgstr "pa_stream_connect_record() falló: %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 "Error en la conexión: %s"
+msgstr "Fallo de conexión: %s"
#: src/utils/pacat.c:557
msgid "Got EOF."
@@ -1861,12 +2232,16 @@ 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
msgid "write() failed: %s"
-msgstr "write() falló: %s"
+msgstr "Ha fallado write(): %s"
#: src/utils/pacat.c:626
msgid "Got signal, exiting."
@@ -1875,17 +2250,17 @@ msgstr "Hay señal, saliendo (exiting)."
#: src/utils/pacat.c:640
#, c-format
msgid "Failed to get latency: %s"
-msgstr "No se pudo obtener latencia: %s"
+msgstr "Error al obtener la latencia: %s"
#: src/utils/pacat.c:645
#, c-format
msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Tiempo: %0.3f seg; Latencia: %0.0f useg."
+msgstr "Tiempo: %0.3f s; latencia: %0.0f µs."
#: src/utils/pacat.c:666
#, c-format
msgid "pa_stream_update_timing_info() failed: %s"
-msgstr "pa_stream_update_timing_info() falló: %s"
+msgstr "Ha fallado pa_stream_update_timing_info(): %s"
#: src/utils/pacat.c:676
#, c-format
@@ -1904,7 +2279,9 @@ msgid ""
" -s, --server=SERVER The name of the server to connect "
"to\n"
" -d, --device=DEVICE The name of the sink/source to "
-"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"
" -n, --client-name=NAME How to call this client on the "
"server\n"
" --stream-name=NAME How to call this stream on the "
@@ -1955,21 +2332,33 @@ msgid ""
msgstr ""
"%s [opciones]\n"
"%s\n"
+<<<<<<< HEAD
"\n"
+=======
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
"\n"
-" -h, --help Muestra esta ayuda\n"
-" --version Muestra la versión\n"
-"\n"
-" -r, --record Hace una conexión para grabación\n"
-" -p, --playback Hace una conexión para reproducción\n"
-"\n"
-" -v, --verbose Operación detallada\n"
-"\n"
-" -s, --server=SERVIDOR Nombre del servidor al que conectar\n"
-" -d, --device=DISPOSITIVO Nombre de la fuente/destino al que "
-"conectar\n"
-" -n, --client-name=NOMBRE Cómo llamar a este cliente en el "
+" -h, --help Mostrar esta ayuda\n"
+" --version Mostrar la versión\n"
+" -r, --record Crear una conexión para la "
+"grabación\n"
+" -p, --playback Crear una conexión para la "
+"reproducción\n"
+" -v, --verbose Activar el registro de las "
+"operaciones\n"
+" -s, --server=SERVIDOR Nombre del servidor al que conectar\n"
+" -d, --device=DISPOSITIVO El nombre del destino/fuente al que "
+"hay que conectarse.\n"
+" Los nombres especiales @DEFAULT_SINK@"
+", @DEFAULT_SOURCE@\n"
+" y @DEFAULT_MONITOR@ se pueden usar "
+"para especificar el\n"
+" destino, la fuente y el monitor por "
+"defecto, respectivamente.\n"
+" -n, --client-name=NOMBRE Cómo llamar a este cliente en el "
"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"
@@ -2008,6 +2397,54 @@ msgstr ""
" --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 "
+"defecto, 44100)\n"
+" --format=FORMATO El formato de muestra, consulte\n"
+" https://www.freedesktop.org/wiki/"
+"Software/PulseAudio/Documentation/User/SupportedAudioFormats/\n"
+" para los valores posibles (por "
+"defecto, s16ne)\n"
+" --channels=CANALES El número de canales, 1 para mono, 2 "
+"para estéreo\n"
+" (por defecto, 2)\n"
+" --channel-map=MAPA Mapa de canales que se usará en vez "
+"del predeterminado\n"
+" --fix-format Tomar el formato de muestra del "
+"destino/fuente a la que\n"
+" se está conectando la transmisión.\n"
+" --fix-rate Tomar la tasa de muestreo del "
+"receptor/fuente a la que\n"
+" se está conectando la transmisión\n"
+" --fix-channels Tomar el número de canales y el mapa "
+"de canales del\n"
+" destino/fuente al que se está "
+"conectando la transmisión.\n"
+" --no-remix No mezclar o desmezclar canales.\n"
+" --no-remap Asignar canales por índice en vez de "
+"por nombre.\n"
+" --latency=BYTES Solicitar la latencia especificada "
+"en bytes.\n"
+" --process-time=BYTES Solicitar el tiempo del proceso "
+"especificado en bytes.\n"
+" --latency-msec=MS Solicitar la latencia especificada "
+"en ms.\n"
+" --process-time-msec=MS Solicitar el tiempo del proceso "
+"especificado en ms.\n"
+" --property=PROPERTY=VALOR Configurar la propiedad especificada "
+"con el valor especificado.\n"
+" --raw Grabar/reproducir datos PCM sin "
+"procesar.\n"
+" --passthrough Paso directo de datos.\n"
+" --file-format[=FORMATO] Grabar/reproducir datos PCM "
+"formateados.\n"
+" --list-file-formats Lista los formatos de archivo "
+"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."
@@ -2034,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
@@ -2048,35 +2489,39 @@ 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 '%s' inválido"
+msgstr "Nombre de cliente no válido '%s'"
#: src/utils/pacat.c:867
#, c-format
msgid "Invalid stream name '%s'"
-msgstr "Nombre de flujo '%s' inválido"
+msgstr "Nombre de transmisión no válido '%s'"
#: src/utils/pacat.c:904
#, c-format
msgid "Invalid channel map '%s'"
-msgstr "Mapa de canales '%s' inválido"
+msgstr "Mapa de canales no válido '%s'"
#: src/utils/pacat.c:933 src/utils/pacat.c:947
#, c-format
msgid "Invalid latency specification '%s'"
-msgstr "Especificación de latencia '%s' inválida"
+msgstr "Especificación de latencia '%s' no válida"
#: src/utils/pacat.c:940 src/utils/pacat.c:954
#, c-format
msgid "Invalid process time specification '%s'"
-msgstr "Especificación de tiempo de proceso '%s' inválida"
+msgstr "Especificación de tiempo de proceso '%s' no válida"
#: src/utils/pacat.c:966
#, c-format
msgid "Invalid property '%s'"
-msgstr "Propiedad '%s' inválida"
+msgstr "Propiedad '%s' no válida"
#: src/utils/pacat.c:985
#, c-format
@@ -2085,11 +2530,11 @@ msgstr "Formato de archivo desconocido %s."
#: src/utils/pacat.c:1000
msgid "Failed to parse the argument for --monitor-stream"
-msgstr "No se pudo interpretar el parámetro de --monitor-stream"
+msgstr "Error al analizar el argumento de --monitor-stream"
#: src/utils/pacat.c:1011
msgid "Invalid sample specification"
-msgstr "Especificación de muestra inválida"
+msgstr "Especificación de muestra no válida"
#: src/utils/pacat.c:1021
#, c-format
@@ -2107,43 +2552,47 @@ msgstr "Demasiados argumentos."
#: src/utils/pacat.c:1044
msgid "Failed to generate sample specification for file."
-msgstr "Falló al generar especificación de ejemplo para el archivo."
+msgstr "Error al generar la especificación de muestra para el archivo."
#: src/utils/pacat.c:1082
msgid "Failed to open audio file."
-msgstr "Falló al abrir el archivo de sonido."
+msgstr "Error al abrir el archivo de audio."
#: src/utils/pacat.c:1088
msgid ""
"Warning: specified sample specification will be overwritten with "
"specification from file."
msgstr ""
-"Aviso: el ejemplo de especificación indicado será sobreescrito con las "
-"especificaciones del archivo."
+"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 "Falló al determinar especificación de ejemplo del archivo."
+msgstr "Error al determinar la especificación de la muestra del archivo."
#: src/utils/pacat.c:1100
msgid "Warning: Failed to determine channel map from file."
-msgstr "Aviso: Falló al determinar el mapeo del canal desde el archivo."
+msgstr "Aviso: error al determinar el mapa de canales del archivo."
#: src/utils/pacat.c:1111
msgid "Channel map doesn't match sample specification"
-msgstr "El mapa del canal no se corresponde con la especificación de muestra"
+msgstr "El mapa de canales no se corresponde con la especificación de muestra"
#: src/utils/pacat.c:1122
msgid "Warning: failed to write channel map to file."
-msgstr "Aviso: Faló al escribir el mapeo del canal en el archivo."
+msgstr "Aviso: error al escribir el mapa de canales en el archivo."
#: src/utils/pacat.c:1137
#, c-format
msgid ""
"Opening a %s stream with sample specification '%s' and channel map '%s'."
msgstr ""
-"Abriendo un flujo %s con especificación de muestra '%s' y mapeo de canal "
-"'%s'."
+"Abriendo una transmisión %s con la especificación de muestra '%s' y el mapa "
+"de canales '%s'."
#: src/utils/pacat.c:1138
msgid "recording"
@@ -2155,78 +2604,112 @@ msgstr "playback"
#: src/utils/pacat.c:1162
msgid "Failed to set media name."
-msgstr "No se pudo establecer el nombre del medio"
+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 "pa_mainloop_new() falló."
+msgstr "Ha fallado pa_mainloop_new()."
#: src/utils/pacat.c:1195
msgid "io_new() failed."
-msgstr "io_new() falló."
+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 "pa_context_new() falló."
+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 "pa_context_connect() falló: %s"
+msgstr "Ha fallado pa_context_connect(): %s"
#: src/utils/pacat.c:1216
msgid "pa_context_rttime_new() failed."
-msgstr "pa_context_rttime_new() falló."
+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 "pa_mainloop_run() falló."
+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
-msgid "NAME|#N"
-msgstr "NOMBRE|#N"
+=======
+#: 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"
#: src/utils/pacmd.c:54
msgid "NAME|#N VOLUME"
-msgstr "NOMBRE|#N VOLUMEN"
+msgstr "NOMBRE|NÚMERO VOLUMEN"
#: src/utils/pacmd.c:55
msgid "#N VOLUME"
-msgstr "#N VOLUMEN"
+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 1|0"
+msgstr "NOMBRE|NÚMERO 1|0"
#: src/utils/pacmd.c:57
msgid "#N 1|0"
-msgstr "#N 1|0"
+msgstr "NÚMERO 1|0"
#: src/utils/pacmd.c:58
msgid "NAME|#N KEY=VALUE"
-msgstr "NOMBRE|#N CLAVE=VALOR"
+msgstr "NOMBRE|NÚMERO CLAVE=VALOR"
#: src/utils/pacmd.c:59
msgid "#N KEY=VALUE"
-msgstr "#N CLAVE=VALOR"
+msgstr "NÚMERO CLAVE=VALOR"
#: src/utils/pacmd.c:61
msgid "#N"
-msgstr "#N"
+msgstr "NÚMERO"
#: src/utils/pacmd.c:62
msgid "NAME SINK|#N"
-msgstr "NOMBRE DESTINO|#N"
+msgstr "NOMBRE DESTINO|NÚMERO"
#: src/utils/pacmd.c:64 src/utils/pacmd.c:65
msgid "NAME FILENAME"
@@ -2238,27 +2721,43 @@ msgstr "RUTA"
#: src/utils/pacmd.c:67
msgid "FILENAME SINK|#N"
-msgstr "ARCHIVO DESTINO|#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 DESTINO|FUENTE"
+msgstr "NÚMERO DESTINO|FUENTE"
#: 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
+=======
+#: src/utils/pacmd.c:72 src/utils/pactl.c:2647
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "CARD PROFILE"
-msgstr "PLACA PERFIL"
+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 PUERTO"
+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-PLACA|#N-PLACA PUERTO DESPLAZAMIENTO"
+msgstr "NOMBRE-TARJETA|NÚMERO-TARJETA PUERTO COMPENSACIÓN"
#: src/utils/pacmd.c:75
msgid "TARGET"
@@ -2272,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]"
@@ -2303,8 +2806,8 @@ msgstr ""
#: src/utils/pacmd.c:143
msgid "No PulseAudio daemon running, or not running as session daemon."
msgstr ""
-"El demonio PulseAudio no está ejecutándose, o no se está ejecutando como un "
-"demonio de sesión."
+"No se está ejecutando el servicio PulseAudio o no se está ejecutando como un "
+"servicio de la sesión."
#: src/utils/pacmd.c:148
#, c-format
@@ -2318,11 +2821,11 @@ msgstr "connect(): %s"
#: src/utils/pacmd.c:173
msgid "Failed to kill PulseAudio daemon."
-msgstr "Error al intentar detener el demonio de PulseAudio."
+msgstr "Error al detener el servicio PulseAudio."
#: src/utils/pacmd.c:181
msgid "Daemon not responding."
-msgstr "El demonio no responde."
+msgstr "El servicio no responde."
#: src/utils/pacmd.c:213 src/utils/pacmd.c:322 src/utils/pacmd.c:340
#, c-format
@@ -2339,24 +2842,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 "Error al intentar obtener estadísticas: %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] ""
@@ -2364,21 +2880,43 @@ msgstr[1] ""
"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] ""
+"Asignados durante todo el tiempo de ejecución: %u bloques que contienen %s "
+"bytes en total.\n"
+
+#: src/utils/pactl.c:211
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid "Sample cache size: %s\n"
-msgstr "Tamaño del cache de muestra: %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 intentar obtener información del servidor: %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"
@@ -2395,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"
@@ -2408,16 +2950,17 @@ msgid ""
"Default Source: %s\n"
"Cookie: %04x:%04x\n"
msgstr ""
-"Nombre de usuario: %s\n"
+"Nombre del usuario: %s\n"
"Nombre del equipo: %s\n"
"Nombre del servidor: %s\n"
"Versión del servidor: %s\n"
"Especificación de muestra por defecto: %s\n"
-"Mapa de canal por defecto: %s\n"
+"Mapa de canales por defecto: %s\n"
"Destino por defecto: %s\n"
"Fuente por defecto: %s\n"
"Cookie: %04x:%04x\n"
+<<<<<<< HEAD
#: src/utils/pactl.c:272
msgid "availability unknown"
msgstr "disponibilidad desconocida"
@@ -2489,11 +3032,83 @@ 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"
+
+#: src/utils/pactl.c:321
+msgid "available"
+msgstr "disponible"
+
+#: src/utils/pactl.c:322
+msgid "not available"
+msgstr "no disponible"
+
+#: src/utils/pactl.c:331 src/utils/pactl.c:355
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: src/utils/pactl.c:332
+msgid "Aux"
+msgstr "Auxiliar"
+
+#: src/utils/pactl.c:335
+msgid "Line"
+msgstr "Línea"
+
+#: src/utils/pactl.c:336
+msgid "Mic"
+msgstr "Micrófono"
+
+#: src/utils/pactl.c:338
+msgid "Handset"
+msgstr "Auricular"
+
+#: src/utils/pactl.c:339
+msgid "Earpiece"
+msgstr "Auricular"
+
+#: src/utils/pactl.c:340
+msgid "SPDIF"
+msgstr "SPDIF"
+
+#: src/utils/pactl.c:341
+msgid "HDMI"
+msgstr "HDMI"
+
+#: src/utils/pactl.c:342
+msgid "TV"
+msgstr "TV"
+
+#: src/utils/pactl.c:345
+msgid "USB"
+msgstr "USB"
+
+#: src/utils/pactl.c:346
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: src/utils/pactl.c:352
+msgid "Network"
+msgstr "Red"
+
+#: src/utils/pactl.c:353
+msgid "Analog"
+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 intentar obtener información del destino: %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"
@@ -2522,6 +3137,7 @@ 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"
@@ -2558,11 +3174,53 @@ 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"
+"\tVolumen base: %s\n"
+"\tFuente del monitor: %s\n"
+"\tLatencia: %0.0f µs, configurados %0.0f µs\n"
+"\tIndicadores: %s%s%s%s%s%s%s\n"
+"\tPropiedades:\n"
+"\t\t%s\n"
+
+#: src/utils/pactl.c:706 src/utils/pactl.c:890 src/utils/pactl.c:1251
+#, c-format
+msgid "\tPorts:\n"
+msgstr "\tPuertos:\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"
+msgstr "\t\t%s: %s (tipo: %s, prioridad: %u%s%s, %s)\n"
+
+#: src/utils/pactl.c:710 src/utils/pactl.c:894 src/utils/pactl.c:1256
+msgid ", availability group: "
+msgstr ", grupo de disponibilidad: "
+
+#: src/utils/pactl.c:715 src/utils/pactl.c:899
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr "\tPuerto Activo: %s\n"
+
+#: src/utils/pactl.c:721 src/utils/pactl.c:905
+#, c-format
+msgid "\tFormats:\n"
+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 intentar obtener información de la fuente: %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"
@@ -2591,16 +3249,25 @@ 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
@@ -2610,11 +3277,26 @@ 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
+#: src/utils/pactl.c:1519 src/utils/pactl.c:1557 src/utils/pactl.c:1582
+#: src/utils/pactl.c:1624
+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 intentar obtener información del módulo: %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"
@@ -2631,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 intentar obtener información del cliente: %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"
@@ -2651,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 "Fallo al obtener la información de la placa: %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"
@@ -2666,33 +3364,55 @@ 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: % usec%s%s, %s)\n"
msgstr ""
+<<<<<<< HEAD
#: src/utils/pactl.c:679
#, c-format
@@ -2709,11 +3429,35 @@ 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: % "
+"µs%s%s, %s)\n"
+
+#: src/utils/pactl.c:1261
+#, 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:1265
+#, c-format
+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 intentar obtener información de entrada del destino: %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"
@@ -2734,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"
@@ -2743,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 "Falló al obtener información de salida de la fuente: %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"
@@ -2787,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 "Falló al obtener información de la muestra: %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"
@@ -2830,11 +3610,16 @@ 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 "Falla: %s"
+msgstr "Fallo: %s"
+<<<<<<< HEAD
#: src/utils/pactl.c:919
#, fuzzy, c-format
msgid "Send message failed: %s"
@@ -2859,10 +3644,14 @@ 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 "Failed to unload module: Module %s not loaded"
-msgstr "No se pudo descargar módulo: el módulo %s no está cargado"
+msgid "Send message failed: %s"
+msgstr "Fallo el envío del mensaje: %s"
+<<<<<<< HEAD
#: src/utils/pactl.c:1051
#, fuzzy, c-format
msgid ""
@@ -2879,10 +3668,56 @@ msgstr[1] ""
"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"
+msgstr "Ha fallado el mensaje de list-handlers: %s"
+
+#: src/utils/pactl.c:1711 src/utils/pactl.c:1760
+msgid "list-handlers message response could not be parsed correctly"
+msgstr ""
+"No se ha podido analizar correctamente la respuesta del mensaje de list-"
+"handlers"
+
+#: src/utils/pactl.c:1718
+msgid "list-handlers message response is not a JSON array"
+msgstr "La respuesta del mensaje de list-handlers no es una matriz de JSON"
+
+#: src/utils/pactl.c:1729
+#, c-format
+msgid "list-handlers message response array element %d is not a JSON object"
+msgstr ""
+"El elemento %d de la matriz de respuesta del mensaje de list-handlers no es "
+"un objeto JSON"
+
+#: src/utils/pactl.c:1800
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "Error al descargar un módulo: el módulo %s no está cargado"
+
+#: src/utils/pactl.c:1818
+#, 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] ""
+"Error al configurar el volumen: ha intentado configurar volúmenes para el "
+"canal %d, pero el canal o los canales compatibles = %d\n"
+msgstr[1] ""
+"Error al configurar el volumen: ha intentado configurar volúmenes para los "
+"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 "Falló al subir muestra: %s"
+msgstr "Error al cargar la muestra: %s"
+<<<<<<< HEAD
#: src/utils/pactl.c:1357
msgid "Premature end of file"
msgstr "Fin de archivo prematuro"
@@ -2916,9 +3751,45 @@ msgid "sink-input"
msgstr "entrada-destino"
#: src/utils/pactl.c:1403
-msgid "source-output"
-msgstr "salida-fuente"
+=======
+#: src/utils/pactl.c:2124
+msgid "Premature end of file"
+msgstr "Fin de archivo prematuro"
+#: src/utils/pactl.c:2144
+msgid "new"
+msgstr "nuevo"
+
+#: src/utils/pactl.c:2147
+msgid "change"
+msgstr "cambiar"
+
+#: src/utils/pactl.c:2150
+msgid "remove"
+msgstr "eliminar"
+
+#: src/utils/pactl.c:2153 src/utils/pactl.c:2188
+msgid "unknown"
+msgstr "desconocido"
+
+#: src/utils/pactl.c:2161
+msgid "sink"
+msgstr "destino"
+
+#: src/utils/pactl.c:2164
+msgid "source"
+msgstr "fuente"
+
+#: src/utils/pactl.c:2167
+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"
@@ -2936,30 +3807,70 @@ msgid "server"
msgstr "servidor"
#: src/utils/pactl.c:1418
-msgid "card"
-msgstr "placa"
+=======
+#: src/utils/pactl.c:2173
+msgid "module"
+msgstr "módulo"
+#: src/utils/pactl.c:2176
+msgid "client"
+msgstr "cliente"
+
+#: src/utils/pactl.c:2179
+msgid "sample-cache"
+msgstr "muestra-caché"
+
+#: src/utils/pactl.c:2182
+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
-msgid "Invalid volume specification"
-msgstr "Especificación de volumen inválida"
+=======
+#: 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
-msgid "Invalid number of volume specifications.\n"
-msgstr "El número de especificaciones de volumen no es válido.\n"
+=======
+#: 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"
@@ -2989,26 +3900,77 @@ 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"
+
+#: 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
+#: src/utils/pactl.c:2645 src/utils/pactl.c:2646 src/utils/pactl.c:2647
+#: src/utils/pactl.c:2648 src/utils/pactl.c:2649 src/utils/pactl.c:2650
+#: src/utils/pactl.c:2651 src/utils/pactl.c:2652 src/utils/pactl.c:2653
+#: src/utils/pactl.c:2654 src/utils/pactl.c:2655 src/utils/pactl.c:2656
+#: src/utils/pactl.c:2657 src/utils/pactl.c:2658 src/utils/pactl.c:2659
+#: src/utils/pactl.c:2660
+msgid "[options]"
+msgstr "[opciones]"
+
+#: src/utils/pactl.c:2638
+msgid "[TYPE]"
+msgstr "[TIPO]"
+
+#: src/utils/pactl.c:2640
+msgid "FILENAME [NAME]"
+msgstr "ARCHIVO [NOMBRE]"
+
+#: src/utils/pactl.c:2641
+msgid "NAME [SINK]"
+msgstr "NOMBRE [DESTINO]"
+
+#: src/utils/pactl.c:2653
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "NAME|#N VOLUME [VOLUME ...]"
-msgstr "NOMBRE|#N VOLUMEN [VOLUMEN ...]"
+msgstr "NOMBRE|NÚMERO VOLUMEN [VOLUMEN ...]"
+<<<<<<< HEAD
#: src/utils/pactl.c:1858
+=======
+#: src/utils/pactl.c:2654
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
msgid "#N VOLUME [VOLUME ...]"
-msgstr "#N VOLUMEN [VOLUMEN ...]"
+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 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 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 FORMATOS"
+msgstr "NÚMERO FORMATOS"
+<<<<<<< HEAD
#: src/utils/pactl.c:1865
+=======
+#: src/utils/pactl.c:2661
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
#, c-format
msgid ""
"\n"
@@ -3017,30 +3979,48 @@ 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 "
"server\n"
msgstr ""
"\n"
-" -h, --help Muestra esta ayuda\n"
-" --version Muestra la versión\n"
+" -h, --help Mostrar esta ayuda\n"
+" --version Mostrar la versión\n"
"\n"
-" -s, --server=SERVIDOR El nombre del servidor al que "
-"conectar\n"
-" -n, --client-name=NOMBRE Cómo llamar a este cliente\n"
+" -f, --format=FORMAT El formato de la salida. Puede ser "
+"\"normal\" o \"json\"\n"
+" -s, --server=SERVER El nombre del servidor al que "
+"conectarse\n"
+" -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"
@@ -3051,41 +4031,77 @@ 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 "Por favor, especifique un archivo de muestra a cargar"
+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 intentar abrir el archivo de sonido."
+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: Falló al intentar determinar especificación de la muestra desde el "
-"archivo."
+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
-msgid "You have to specify a sample name to remove"
-msgstr "Debe especificar un nombre de muestra a eliminar"
+=======
+#: 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
-msgid "You have to specify a source output index and a source"
-msgstr "Debe especificar un índice para las salida de la fuente y una fuente"
+=======
+#: 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."
@@ -3095,17 +4111,36 @@ 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."
+
+#: src/utils/pactl.c:2889
+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."
@@ -3113,10 +4148,15 @@ 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 placa y un nombre de perfil"
+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"
@@ -3139,9 +4179,37 @@ msgid "You have to specify a sink name/index"
msgstr "Debe indicar un nombre de destino"
#: src/utils/pactl.c:2196
-msgid "You have to specify a sink name/index and a volume"
-msgstr "Debe especificar un nombre/índice de destino y el volumen"
+=======
+#: 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"
+#: src/utils/pactl.c:2961
+msgid "You have to specify a sink name"
+msgstr "Debe indicar un nombre de destino"
+
+#: src/utils/pactl.c:2974
+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:2985
+msgid "You have to specify a source name"
+msgstr "Debe indicar un nombre de fuente"
+
+#: src/utils/pactl.c:2998 src/utils/pactl.c:3076
+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"
+
+#: src/utils/pactl.c:3021 src/utils/pactl.c:3101
+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"
@@ -3156,29 +4224,59 @@ 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"
+
+#: src/utils/pactl.c:3044
+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 al destino no es válido"
+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 y un volumen"
+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 la fuente no es válido"
+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 un booleano de silenciador"
+"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 silencio no es válida"
+msgstr "La especificación de silenciar no es válida"
+<<<<<<< HEAD
#: src/utils/pactl.c:2299
#, fuzzy
msgid ""
@@ -3187,15 +4285,31 @@ 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')"
+msgstr ""
+"Debe especificar un nombre/índice de fuente y una acción de silenciar (0, 1 "
+"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 a destino y un booleano de silenciador"
+"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 de índice de entrada a destino no es válida"
+msgstr "La especificación del índice de entrada de destino no es válida"
+<<<<<<< HEAD
#: src/utils/pactl.c:2332
#, fuzzy
msgid ""
@@ -3204,9 +4318,34 @@ msgid ""
msgstr "Debe especificar un índice de salida y un indicador de silencio"
#: src/utils/pactl.c:2337
-msgid "Invalid source output index specification"
-msgstr "La especificación de índice de salida de la fuente no es válida"
+=======
+#: src/utils/pactl.c:3144
+msgid ""
+"You have to specify a source output index and a mute action (0, 1, or "
+"'toggle')"
+msgstr ""
+"Debe especificar un índice de salida de fuente y una acción de silenciar (0, "
+"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"
+
+#: src/utils/pactl.c:3162
+msgid "You have to specify at least an object path and a message name"
+msgstr ""
+"Debe especificar al menos una ruta de acceso al objeto y un nombre de mensaje"
+
+#: src/utils/pactl.c:3172
+msgid ""
+"Excess arguments given, they will be ignored. Note that all message "
+"parameters must be given as a single string."
+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"
@@ -3219,6 +4358,9 @@ msgid ""
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"
@@ -3226,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 indicar un nombre o índice de place, un nombre de puerto y un "
-"desplazamiento de latencia"
+"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 pudo interpretar el desplazamiento de latencia"
+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."
@@ -3253,22 +4407,22 @@ msgstr "execvp(): %s\n"
#: src/utils/pasuspender.c:111
#, c-format
msgid "Failure to resume: %s\n"
-msgstr "Error al continuar: %s\n"
+msgstr "Fallo al reanudar: %s\n"
#: src/utils/pasuspender.c:145
#, c-format
msgid "Failure to suspend: %s\n"
-msgstr "Error al suspender: %s\n"
+msgstr "Fallo al suspender: %s\n"
#: src/utils/pasuspender.c:170
#, c-format
msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr "AVISO: El servidor de sonido no es local, no se suspende.\n"
+msgstr "AVISO: el servidor de sonido no es local, no se suspende.\n"
#: src/utils/pasuspender.c:183
#, c-format
msgid "Connection failure: %s\n"
-msgstr "Error en la conexión: %s\n"
+msgstr "Fallo de conexión: %s\n"
#: src/utils/pasuspender.c:201
#, c-format
@@ -3278,10 +4432,14 @@ msgstr "Hay SIGINT, saliendo.\n"
#: src/utils/pasuspender.c:219
#, c-format
msgid "WARNING: Child process terminated by signal %u\n"
-msgstr "AVISO: El proceso niño terminado por la señal %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"
@@ -3293,11 +4451,13 @@ msgid ""
"to\n"
"\n"
msgstr ""
-"%s [opciones] ... \n"
+"%s [opciones] -- PROGRAMA [ARGUMENTOS ...]\n"
"\n"
-" -h, --help Muestra esta ayuda\n"
-" --version Muestra la versión\n"
-" -s, --server=SERVER El nombre del servidor con el que "
+"Suspende temporalmente PulseAudio mientras se ejecuta el PROGRAMA.\n"
+"\n"
+" -h, --help Mostrar esta ayuda\n"
+" --version Mostrar la versión\n"
+" -s, --server=SERVIDOR El nombre del servidor al que "
"conectarse\n"
"\n"
@@ -3315,17 +4475,17 @@ msgstr ""
#: src/utils/pasuspender.c:296
#, c-format
msgid "pa_mainloop_new() failed.\n"
-msgstr "pa_mainloop_new() falló.\n"
+msgstr "Ha fallado pa_mainloop_new().\n"
#: src/utils/pasuspender.c:309
#, c-format
msgid "pa_context_new() failed.\n"
-msgstr "pa_context_new() falló.\n"
+msgstr "Ha fallado pa_context_new().\n"
#: src/utils/pasuspender.c:321
#, c-format
msgid "pa_mainloop_run() failed.\n"
-msgstr "pa_mainloop_run() falló.\n"
+msgstr "Ha fallado pa_mainloop_run().\n"
#: src/utils/pax11publish.c:58
#, c-format
@@ -3338,19 +4498,20 @@ msgid ""
"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"
+"%s [-D pantalla] [-S servidor] [-O destino] [-I fuente] [-c archivo] "
+"[-d|-e|-i|-r]\n"
"\n"
-" -d Muestra los datos actuales de PulseAudio asociados en un display X11 "
+" -d Mostrar los datos actuales de PulseAudio asociados a una pantalla X11 "
"(por defecto)\n"
-" -e Exporta los datos locales de PulseAudio a un display X11\n"
-" -i Importa los datos de PulseAudio de un display X11 hacia las variables "
-"del entorno local y el archivo de cookies.\n"
-" -r Elimina todo dato de PulseAudio de un display X11\n"
+" -e Exportar los datos locales de PulseAudio a una pantalla X11\n"
+" -i Importar los datos de PulseAudio de una pantalla X11 a las variables "
+"del entorno locales y al archivo de cookies.\n"
+" -r Eliminar los datos de PulseAudio de una pantalla X11\n"
#: src/utils/pax11publish.c:91
#, c-format
msgid "Failed to parse command line.\n"
-msgstr "Error al interpretar una línea de comando.\n"
+msgstr "Error al analizar la línea de órdenes.\n"
#: src/utils/pax11publish.c:110
#, c-format
@@ -3375,22 +4536,22 @@ msgstr "Cookie: %s\n"
#: src/utils/pax11publish.c:134
#, c-format
msgid "Failed to parse cookie data\n"
-msgstr "Error al intepretar datos de cookie\n"
+msgstr "Error al analizar los datos de la cookie\n"
#: src/utils/pax11publish.c:139
#, c-format
msgid "Failed to save cookie data\n"
-msgstr "Error al intentar guardar datos de cookie\n"
+msgstr "Error al guardar los datos de la cookie\n"
#: src/utils/pax11publish.c:168
#, c-format
msgid "Failed to get FQDN.\n"
-msgstr "Error al obtener FQDN.\n"
+msgstr "Error al obtener el FQDN.\n"
#: src/utils/pax11publish.c:188
#, c-format
msgid "Failed to load cookie data\n"
-msgstr "Error al cargar datos de cookie\n"
+msgstr "Error al cargar datos de la cookie\n"
#: src/utils/pax11publish.c:206
#, c-format
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 000000000..b5a0a3cc9
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,2902 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the pulseaudio package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pulseaudio\n"
+"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/"
+"issues/new\n"
+"POT-Creation-Date: 2022-06-18 09:49+0300\n"
+"PO-Revision-Date: 2023-06-04 21:20+0000\n"
+"Last-Translator: Asier Sarasua Garmendia \n"
+"Language-Team: Basque \n"
+"Language: eu\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"
+"X-Generator: Weblate 4.17\n"
+
+#: src/daemon/cmdline.c:113
+#, c-format
+msgid ""
+"%s [options]\n"
+"\n"
+"COMMANDS:\n"
+" -h, --help Show this help\n"
+" --version Show version\n"
+" --dump-conf Dump default configuration\n"
+" --dump-modules Dump list of available modules\n"
+" --dump-resample-methods Dump available resample methods\n"
+" --cleanup-shm Cleanup stale shared memory segments\n"
+" --start Start the daemon if it is not running\n"
+" -k --kill Kill a running daemon\n"
+" --check Check for a running daemon (only returns exit "
+"code)\n"
+"\n"
+"OPTIONS:\n"
+" --system[=BOOL] Run as system-wide instance\n"
+" -D, --daemonize[=BOOL] Daemonize after startup\n"
+" --fail[=BOOL] Quit when startup fails\n"
+" --high-priority[=BOOL] Try to set high nice level\n"
+" (only available as root, when SUID or\n"
+" with elevated RLIMIT_NICE)\n"
+" --realtime[=BOOL] Try to enable realtime scheduling\n"
+" (only available as root, when SUID or\n"
+" with elevated RLIMIT_RTPRIO)\n"
+" --disallow-module-loading[=BOOL] Disallow user requested module\n"
+" loading/unloading after startup\n"
+" --disallow-exit[=BOOL] Disallow user requested exit\n"
+" --exit-idle-time=SECS Terminate the daemon when idle and this\n"
+" time passed\n"
+" --scache-idle-time=SECS Unload autoloaded samples when idle and\n"
+" this time passed\n"
+" --log-level[=LEVEL] Increase or set verbosity level\n"
+" -v --verbose Increase the verbosity level\n"
+" --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+" Specify the log target\n"
+" --log-meta[=BOOL] Include code location in log messages\n"
+" --log-time[=BOOL] Include timestamps in log messages\n"
+" --log-backtrace=FRAMES Include a backtrace in log messages\n"
+" -p, --dl-search-path=PATH Set the search path for dynamic shared\n"
+" objects (plugins)\n"
+" --resample-method=METHOD Use the specified resampling method\n"
+" (See --dump-resample-methods for\n"
+" possible values)\n"
+" --use-pid-file[=BOOL] Create a PID file\n"
+" --no-cpu-limit[=BOOL] Do not install CPU load limiter on\n"
+" platforms that support it.\n"
+" --disable-shm[=BOOL] Disable shared memory support.\n"
+" --enable-memfd[=BOOL] Enable memfd shared memory support.\n"
+"\n"
+"STARTUP SCRIPT:\n"
+" -L, --load=\"MODULE ARGUMENTS\" Load the specified plugin module with\n"
+" the specified argument\n"
+" -F, --file=FILENAME Run the specified script\n"
+" -C Open a command line on the running TTY\n"
+" after startup\n"
+"\n"
+" -n Don't load default script file\n"
+msgstr ""
+
+#: src/daemon/cmdline.c:246
+msgid "--daemonize expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:254
+msgid "--fail expects boolean argument"
+msgstr ""
+
+#: 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 ""
+
+#: src/daemon/cmdline.c:277
+msgid "--high-priority expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:285
+msgid "--realtime expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:293
+msgid "--disallow-module-loading expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:301
+msgid "--disallow-exit expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:309
+msgid "--use-pid-file expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:328
+msgid ""
+"Invalid log target: use either 'syslog', 'journal', 'stderr' or 'auto' or a valid file "
+"name 'file:', 'newfile:'."
+msgstr ""
+
+#: src/daemon/cmdline.c:330
+msgid ""
+"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file name 'file:"
+"', 'newfile:'."
+msgstr ""
+
+#: src/daemon/cmdline.c:338
+msgid "--log-time expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:346
+msgid "--log-meta expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:366
+#, c-format
+msgid "Invalid resample method '%s'."
+msgstr ""
+
+#: src/daemon/cmdline.c:373
+msgid "--system expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:381
+msgid "--no-cpu-limit expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:389
+msgid "--disable-shm expects boolean argument"
+msgstr ""
+
+#: src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr ""
+
+#: src/daemon/daemon-conf.c:270
+#, c-format
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:285
+#, c-format
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:300
+#, c-format
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:322
+#, c-format
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:342
+#, c-format
+msgid "[%s:%u] Invalid sample format '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:359 src/daemon/daemon-conf.c:376
+#, c-format
+msgid "[%s:%u] Invalid sample rate '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:399
+#, c-format
+msgid "[%s:%u] Invalid sample channels '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:416
+#, c-format
+msgid "[%s:%u] Invalid channel map '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:433
+#, c-format
+msgid "[%s:%u] Invalid number of fragments '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:450
+#, c-format
+msgid "[%s:%u] Invalid fragment size '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:467
+#, c-format
+msgid "[%s:%u] Invalid nice level '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:552
+#, c-format
+msgid "[%s:%u] Invalid server type '%s'."
+msgstr ""
+
+#: src/daemon/daemon-conf.c:685
+#, c-format
+msgid "Failed to open configuration file: %s"
+msgstr ""
+
+#: 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 ""
+
+#: src/daemon/daemon-conf.c:788
+#, c-format
+msgid "### Read from configuration file: %s ###\n"
+msgstr ""
+
+#: src/daemon/dumpmodules.c:57
+#, c-format
+msgid "Name: %s\n"
+msgstr "Izena: %s\n"
+
+#: src/daemon/dumpmodules.c:60
+#, c-format
+msgid "No module information available\n"
+msgstr "Ez dago moduluaren informaziorik erabilgarri\n"
+
+#: src/daemon/dumpmodules.c:63
+#, c-format
+msgid "Version: %s\n"
+msgstr "Bertsioa: %s\n"
+
+#: src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Description: %s\n"
+msgstr "Deskribapena: %s\n"
+
+#: src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Author: %s\n"
+msgstr "Egilea: %s\n"
+
+#: src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Erabilera: %s\n"
+
+#: src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Kargatu behin: %s\n"
+
+#: src/daemon/dumpmodules.c:72
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "ZAHARKITZE-ABISUA: %s\n"
+
+#: src/daemon/dumpmodules.c:76
+#, c-format
+msgid "Path: %s\n"
+msgstr "Bide-izena: %s\n"
+
+#: src/daemon/ltdl-bind-now.c:75
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "Huts egin du %s modulua irekitzeak: %s"
+
+#: src/daemon/ltdl-bind-now.c:126
+msgid "Failed to find original lt_dlopen loader."
+msgstr ""
+
+#: src/daemon/ltdl-bind-now.c:131
+msgid "Failed to allocate new dl loader."
+msgstr ""
+
+#: src/daemon/ltdl-bind-now.c:144
+msgid "Failed to add bind-now-loader."
+msgstr ""
+
+#: src/daemon/main.c:265
+#, c-format
+msgid "Failed to find user '%s'."
+msgstr ""
+
+#: src/daemon/main.c:270
+#, c-format
+msgid "Failed to find group '%s'."
+msgstr ""
+
+#: src/daemon/main.c:279
+#, c-format
+msgid "GID of user '%s' and of group '%s' don't match."
+msgstr ""
+
+#: src/daemon/main.c:284
+#, c-format
+msgid "Home directory of user '%s' is not '%s', ignoring."
+msgstr ""
+
+#: src/daemon/main.c:287 src/daemon/main.c:292
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr ""
+
+#: src/daemon/main.c:299
+#, c-format
+msgid "Failed to change group list: %s"
+msgstr ""
+
+#: src/daemon/main.c:315
+#, c-format
+msgid "Failed to change GID: %s"
+msgstr ""
+
+#: src/daemon/main.c:331
+#, c-format
+msgid "Failed to change UID: %s"
+msgstr ""
+
+#: 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 "Huts egin du komando-lerroa analizatzeak."
+
+#: src/daemon/main.c:689
+msgid ""
+"System mode refused for non-root user. Only starting the D-Bus server lookup service."
+msgstr ""
+
+#: src/daemon/main.c:788
+#, c-format
+msgid "Failed to kill daemon: %s"
+msgstr ""
+
+#: src/daemon/main.c:817
+msgid "This program is not intended to be run as root (unless --system is specified)."
+msgstr ""
+
+#: src/daemon/main.c:820
+msgid "Root privileges required."
+msgstr ""
+
+#: src/daemon/main.c:827
+msgid "--start not supported for system instances."
+msgstr ""
+
+#: src/daemon/main.c:867
+#, c-format
+msgid "User-configured server at %s, refusing to start/autospawn."
+msgstr ""
+
+#: 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 ""
+
+#: src/daemon/main.c:881
+msgid "Running in system mode, but --disallow-module-loading not set."
+msgstr ""
+
+#: src/daemon/main.c:884
+msgid "Running in system mode, forcibly disabling SHM mode."
+msgstr ""
+
+#: src/daemon/main.c:889
+msgid "Running in system mode, forcibly disabling exit idle time."
+msgstr ""
+
+#: 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() funtzioak huts egin du: %s"
+
+#: src/daemon/main.c:933 src/daemon/main.c:1004
+#, c-format
+msgid "fork() failed: %s"
+msgstr "fork() funtzioak huts egin du: %s"
+
+#: src/daemon/main.c:948 src/daemon/main.c:1019 src/utils/pacat.c:562
+#, c-format
+msgid "read() failed: %s"
+msgstr "read() funtzioak huts egin du: %s"
+
+#: src/daemon/main.c:954
+msgid "Daemon startup failed."
+msgstr ""
+
+#: src/daemon/main.c:987
+#, c-format
+msgid "setsid() failed: %s"
+msgstr ""
+
+#: src/daemon/main.c:1119
+msgid "Failed to get machine ID"
+msgstr ""
+
+#: 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 ""
+
+#: src/daemon/main.c:1161
+msgid "pa_pid_file_create() failed."
+msgstr ""
+
+#: src/daemon/main.c:1193
+msgid "pa_core_new() failed."
+msgstr ""
+
+#: 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 ""
+
+#: 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:1956
+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:343
+msgid "Radio"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2719 src/modules/alsa/alsa-mixer.c:2805
+#: src/utils/pactl.c:344
+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:1964
+#: src/utils/pactl.c:333
+msgid "Speaker"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2729 src/modules/alsa/alsa-mixer.c:2807
+#: src/utils/pactl.c:334
+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 ""
+
+#: 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 ""
+
+#: src/modules/alsa/alsa-mixer.c:2814
+msgid "Digital Output (S/PDIF)"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:2815
+msgid "Digital Input (S/PDIF)"
+msgstr ""
+
+#: 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:1944 src/utils/pactl.c:337
+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 ""
+
+#: 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 ""
+
+#: src/modules/alsa/alsa-mixer.c:4592
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4593
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4594
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4595
+msgid "Digital Stereo (HDMI)"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4596
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr ""
+
+#: 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 ""
+
+#: 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:2263
+msgid "Off"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4840
+#, c-format
+msgid "%s Output"
+msgstr ""
+
+#: src/modules/alsa/alsa-mixer.c:4848
+#, c-format
+msgid "%s Input"
+msgstr ""
+
+#: src/modules/alsa/alsa-sink.c:672 src/modules/alsa/alsa-sink.c:862
+#, 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:636 src/modules/alsa/alsa-source.c:802
+#, 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:1937
+#: src/modules/bluetooth/module-bluez5-device.c:1963
+#: src/modules/bluetooth/module-bluez5-device.c:1970
+msgid "Bluetooth Input"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1938
+#: src/modules/bluetooth/module-bluez5-device.c:1957
+msgid "Bluetooth Output"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1950 src/utils/pactl.c:348
+msgid "Handsfree"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1971
+msgid "Headphone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1977 src/utils/pactl.c:347
+msgid "Portable"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1983 src/utils/pactl.c:349
+msgid "Car"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1989 src/utils/pactl.c:350
+msgid "HiFi"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:1995 src/utils/pactl.c:351
+msgid "Phone"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2042
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2054
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2066
+msgid "Headset Head Unit (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2079
+msgid "Headset Audio Gateway (HSP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2092
+msgid "Handsfree Head Unit (HFP)"
+msgstr ""
+
+#: src/modules/bluetooth/module-bluez5-device.c:2105
+msgid "Handsfree Audio Gateway (HFP)"
+msgstr ""
+
+#: src/modules/echo-cancel/module-echo-cancel.c:59
+msgid ""
+"source_name= source_properties= "
+"source_master= sink_name= "
+"sink_properties= sink_master= "
+"adjust_time=